[Scummvm-cvs-logs] SF.net SVN: scummvm:[46734] scummvm/trunk/engines/mohawk

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Wed Dec 30 08:14:09 CET 2009


Revision: 46734
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46734&view=rev
Author:   eriktorbjorn
Date:     2009-12-30 07:14:09 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Re-indentet switch() blocks to follow ScummVM indentation style. (I've always
found this style a bit unusual, but I value consistency.)

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/bitmap.cpp
    scummvm/trunk/engines/mohawk/dialogs.cpp
    scummvm/trunk/engines/mohawk/graphics.cpp
    scummvm/trunk/engines/mohawk/livingbooks.cpp
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst_scripts.cpp
    scummvm/trunk/engines/mohawk/myst_vars.cpp
    scummvm/trunk/engines/mohawk/riven.cpp
    scummvm/trunk/engines/mohawk/riven_external.cpp
    scummvm/trunk/engines/mohawk/riven_saveload.cpp
    scummvm/trunk/engines/mohawk/sound.cpp

Modified: scummvm/trunk/engines/mohawk/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/bitmap.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/bitmap.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -84,18 +84,18 @@
 
 byte MohawkBitmap::getBitsPerPixel() {
 	switch (_header.format & kBitsPerPixelMask) {
-		case kBitsPerPixel1:
-			return 1;
-		case kBitsPerPixel4:
-			return 4;
-		case kBitsPerPixel8:
-			return 8;
-		case kBitsPerPixel16:
-			return 16;
-		case kBitsPerPixel24:
-			return 24;
-		default:
-			error ("Unknown bits per pixel");
+	case kBitsPerPixel1:
+		return 1;
+	case kBitsPerPixel4:
+		return 4;
+	case kBitsPerPixel8:
+		return 8;
+	case kBitsPerPixel16:
+		return 16;
+	case kBitsPerPixel24:
+		return 24;
+	default:
+		error ("Unknown bits per pixel");
 	}
 	
 	return 0;

Modified: scummvm/trunk/engines/mohawk/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/dialogs.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/dialogs.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -97,17 +97,17 @@
 
 void MystOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
-		case kZipCmd:
-			_vm->_zipMode = _zipModeCheckbox->getState();
-			break;
-		case kTransCmd:
-			_vm->_transitionsEnabled = _transistionsCheckbox->getState();
-			break;
-		case kCloseCmd:
-			close();
-			break;
-		default:
-			GUI::OptionsDialog::handleCommand(sender, cmd, data);
+	case kZipCmd:
+		_vm->_zipMode = _zipModeCheckbox->getState();
+		break;
+	case kTransCmd:
+		_vm->_transitionsEnabled = _transistionsCheckbox->getState();
+		break;
+	case kCloseCmd:
+		close();
+		break;
+	default:
+		GUI::OptionsDialog::handleCommand(sender, cmd, data);
 	}
 }
 
@@ -131,17 +131,17 @@
 
 void RivenOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
-		case kZipCmd:
-			*_vm->matchVarToString("azip") = _zipModeCheckbox->getState() ? 1 : 0;
-			break;
-		case kWaterCmd:
-			*_vm->matchVarToString("waterenabled") = _waterEffectCheckbox->getState() ? 1 : 0;
-			break;
-		case kCloseCmd:
-			close();
-			break;
-		default:
-			GUI::OptionsDialog::handleCommand(sender, cmd, data);
+	case kZipCmd:
+		*_vm->matchVarToString("azip") = _zipModeCheckbox->getState() ? 1 : 0;
+		break;
+	case kWaterCmd:
+		*_vm->matchVarToString("waterenabled") = _waterEffectCheckbox->getState() ? 1 : 0;
+		break;
+	case kCloseCmd:
+		close();
+		break;
+	default:
+		GUI::OptionsDialog::handleCommand(sender, cmd, data);
 	}
 }
 

Modified: scummvm/trunk/engines/mohawk/graphics.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/graphics.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/graphics.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -463,27 +463,27 @@
 	// transitions were found by hacking scripts.
 
 	switch (_scheduledTransition) {
-		case 12: // Pan Left
-			warning ("STUB: Pan left");
-			break;
-		case 13: // Pan Right
-			warning ("STUB: Pan right");
-			break;
-		case 14: // Pan Up
-			warning ("STUB: Pan up");
-			break;
-		case 15: // Pan Down
-			warning ("STUB: Pan down");
-			break;
-		case 16: // Dissolve
-		case 17: // Dissolve (tspit CARD 155)
-			warning ("STUB: Dissolve");
-			break;
-		default:
-			if (_scheduledTransition < 12)
-				error ("Found unused transition %d", _scheduledTransition);
-			else
-				error ("Found unknown transition %d", _scheduledTransition);
+	case 12: // Pan Left
+		warning ("STUB: Pan left");
+		break;
+	case 13: // Pan Right
+		warning ("STUB: Pan right");
+		break;
+	case 14: // Pan Up
+		warning ("STUB: Pan up");
+		break;
+	case 15: // Pan Down
+		warning ("STUB: Pan down");
+		break;
+	case 16: // Dissolve
+	case 17: // Dissolve (tspit CARD 155)
+		warning ("STUB: Dissolve");
+		break;
+	default:
+		if (_scheduledTransition < 12)
+			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.
@@ -498,90 +498,90 @@
 	// All of Riven's cursors are hardcoded. See riven_cursors.h for these definitions.
 
 	switch (num) {
-		case 1002:
-			// Zip Mode
-			CursorMan.replaceCursor(zipModeCursor, 16, 16, 8, 8, 0);
-			CursorMan.replaceCursorPalette(zipModeCursorPalette, 1, ARRAYSIZE(zipModeCursorPalette) / 4);
-			break;
-		case 2003:
-			// Hand Over Object
-			CursorMan.replaceCursor(objectHandCursor, 16, 16, 8, 8, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 2004:
-			// Grabbing/Using Object
-			CursorMan.replaceCursor(grabbingHandCursor, 13, 13, 6, 6, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3000:
-			// Standard Hand
-			CursorMan.replaceCursor(standardHandCursor, 15, 16, 6, 0, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3001:
-			// Pointing Left
-			CursorMan.replaceCursor(pointingLeftCursor, 15, 13, 0, 3, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3002:
-			// Pointing Right
-			CursorMan.replaceCursor(pointingRightCursor, 15, 13, 14, 3, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3003:
-			// Pointing Down (Palm Up)
-			CursorMan.replaceCursor(pointingDownCursorPalmUp, 13, 16, 3, 15, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3004:
-			// Pointing Up (Palm Up)
-			CursorMan.replaceCursor(pointingUpCursorPalmUp, 13, 16, 3, 0, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3005:
-			// Pointing Left (Curved)
-			CursorMan.replaceCursor(pointingLeftCursorBent, 15, 13, 0, 5, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3006:
-			// Pointing Right (Curved)
-			CursorMan.replaceCursor(pointingRightCursorBent, 15, 13, 14, 5, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 3007:
-			// Pointing Down (Palm Down)
-			CursorMan.replaceCursor(pointingDownCursorPalmDown, 15, 16, 7, 15, 0);
-			CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
-			break;
-		case 4001:
-			// Red Marble
-			break;
-		case 4002:
-			// Orange Marble
-			break;
-		case 4003:
-			// Yellow Marble
-			break;
-		case 4004:
-			// Green Marble
-			break;
-		case 4005:
-			// Blue Marble
-			break;
-		case 4006:
-			// Purple Marble
-			break;
-		case 5000:
-			// Pellet
-			CursorMan.replaceCursor(pelletCursor, 8, 8, 4, 4, 0);
-			CursorMan.replaceCursorPalette(pelletCursorPalette, 1, ARRAYSIZE(pelletCursorPalette) / 4);
-			break;
-		case 9000:
-			// Hide Cursor
-			CursorMan.showMouse(false);
-			break;
-		default:
-			error ("Cursor %d does not exist!", num);
+	case 1002:
+		// Zip Mode
+		CursorMan.replaceCursor(zipModeCursor, 16, 16, 8, 8, 0);
+		CursorMan.replaceCursorPalette(zipModeCursorPalette, 1, ARRAYSIZE(zipModeCursorPalette) / 4);
+		break;
+	case 2003:
+		// Hand Over Object
+		CursorMan.replaceCursor(objectHandCursor, 16, 16, 8, 8, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 2004:
+		// Grabbing/Using Object
+		CursorMan.replaceCursor(grabbingHandCursor, 13, 13, 6, 6, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3000:
+		// Standard Hand
+		CursorMan.replaceCursor(standardHandCursor, 15, 16, 6, 0, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3001:
+		// Pointing Left
+		CursorMan.replaceCursor(pointingLeftCursor, 15, 13, 0, 3, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3002:
+		// Pointing Right
+		CursorMan.replaceCursor(pointingRightCursor, 15, 13, 14, 3, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3003:
+		// Pointing Down (Palm Up)
+		CursorMan.replaceCursor(pointingDownCursorPalmUp, 13, 16, 3, 15, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3004:
+		// Pointing Up (Palm Up)
+		CursorMan.replaceCursor(pointingUpCursorPalmUp, 13, 16, 3, 0, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3005:
+		// Pointing Left (Curved)
+		CursorMan.replaceCursor(pointingLeftCursorBent, 15, 13, 0, 5, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3006:
+		// Pointing Right (Curved)
+		CursorMan.replaceCursor(pointingRightCursorBent, 15, 13, 14, 5, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 3007:
+		// Pointing Down (Palm Down)
+		CursorMan.replaceCursor(pointingDownCursorPalmDown, 15, 16, 7, 15, 0);
+		CursorMan.replaceCursorPalette(handCursorPalette, 1, ARRAYSIZE(handCursorPalette) / 4);
+		break;
+	case 4001:
+		// Red Marble
+		break;
+	case 4002:
+		// Orange Marble
+		break;
+	case 4003:
+		// Yellow Marble
+		break;
+	case 4004:
+		// Green Marble
+		break;
+	case 4005:
+		// Blue Marble
+		break;
+	case 4006:
+		// Purple Marble
+		break;
+	case 5000:
+		// Pellet
+		CursorMan.replaceCursor(pelletCursor, 8, 8, 4, 4, 0);
+		CursorMan.replaceCursorPalette(pelletCursorPalette, 1, ARRAYSIZE(pelletCursorPalette) / 4);
+		break;
+	case 9000:
+		// Hide Cursor
+		CursorMan.showMouse(false);
+		break;
+	default:
+		error ("Cursor %d does not exist!", num);
 	}
 	
 	if (num != 9000) // Show Cursor

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -77,29 +77,29 @@
 	while (!shouldQuit()) {
 		while (_eventMan->pollEvent(event)) {
 			switch (event.type) {
-				case Common::EVENT_MOUSEMOVE:
+			case Common::EVENT_MOUSEMOVE:
+				break;
+			case Common::EVENT_LBUTTONUP:
+				break;
+			case Common::EVENT_LBUTTONDOWN:
+				break;
+			case Common::EVENT_KEYDOWN:
+				switch (event.kbd.keycode) {
+				case Common::KEYCODE_d:
+					if (event.kbd.flags & Common::KBD_CTRL) {
+						_console->attach();
+						_console->onFrame();
+					}
 					break;
-				case Common::EVENT_LBUTTONUP:
+				case Common::KEYCODE_SPACE:
+					pauseGame();
 					break;
-				case Common::EVENT_LBUTTONDOWN:
-					break;
-				case Common::EVENT_KEYDOWN:
-					switch (event.kbd.keycode) {
-						case Common::KEYCODE_d:
-							if (event.kbd.flags & Common::KBD_CTRL) {
-								_console->attach();
-								_console->onFrame();
-							}
-							break;
-						case Common::KEYCODE_SPACE:
-							pauseGame();
-							break;
-						default:
-							break;
-					}
-					break;
 				default:
 					break;
+				}
+				break;
+			default:
+				break;
 			}
 		}
 

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -118,34 +118,34 @@
 	const char* prefix;
 	
 	switch (stack) {
-		case kIntroStack:
-			prefix = "intro/";
-			break;
-		case kChannelwoodStack:
-			// The Windmill videos like to hide in a different folder
-			if (movieName.contains("wmill"))
-				prefix = "channel2/";
-			else
-				prefix = "channel/";
-			break;
-		case kDniStack:
-			prefix = "dunny/";
-			break;
-		case kMechanicalStack:
-			prefix = "mech/";
-			break;
-		case kMystStack:
-			prefix = "myst/";
-			break;
-		case kSeleniticStack:
-			prefix = "selen/";
-			break;
-		case kStoneshipStack:
-			prefix = "stone/";
-			break;
-		default:
-			prefix = ""; // Masterpiece Edition Only Movies
-			break;
+	case kIntroStack:
+		prefix = "intro/";
+		break;
+	case kChannelwoodStack:
+		// The Windmill videos like to hide in a different folder
+		if (movieName.contains("wmill"))
+			prefix = "channel2/";
+		else
+			prefix = "channel/";
+		break;
+	case kDniStack:
+		prefix = "dunny/";
+		break;
+	case kMechanicalStack:
+		prefix = "mech/";
+		break;
+	case kMystStack:
+		prefix = "myst/";
+		break;
+	case kSeleniticStack:
+		prefix = "selen/";
+		break;
+	case kStoneshipStack:
+		prefix = "stone/";
+		break;
+	default:
+		prefix = ""; // Masterpiece Edition Only Movies
+		break;
 	}
 
 	if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh)
@@ -243,52 +243,52 @@
 
 		while (_eventMan->pollEvent(event)) {
 			switch (event.type) {
-				case Common::EVENT_MOUSEMOVE:
-					_mousePos = event.mouse;
-					_needsUpdate = true;
-					checkCurrentResource();
-					break;
-				case Common::EVENT_LBUTTONUP:
-					if (_curResource >= 0) {
-						debug(2, "Sending mouse up event to resource %d\n", _curResource);
-						_resources[_curResource]->handleMouseUp();
-					}
+			case Common::EVENT_MOUSEMOVE:
+				_mousePos = event.mouse;
+				_needsUpdate = true;
+				checkCurrentResource();
+				break;
+			case Common::EVENT_LBUTTONUP:
+				if (_curResource >= 0) {
+					debug(2, "Sending mouse up event to resource %d\n", _curResource);
+					_resources[_curResource]->handleMouseUp();
+				}
 
-					for (uint16 i = 0; i < _resources.size(); i++)
-						if (_resources[i]->isEnabled())
-							_resources[i]->drawDataToScreen();
-					break;
-				case Common::EVENT_LBUTTONDOWN:
-					if (_curResource >= 0) {
-						debug(2, "Sending mouse up event to resource %d\n", _curResource);
-						_resources[_curResource]->handleMouseDown();
+				for (uint16 i = 0; i < _resources.size(); i++)
+					if (_resources[i]->isEnabled())
+						_resources[i]->drawDataToScreen();
+				break;
+			case Common::EVENT_LBUTTONDOWN:
+				if (_curResource >= 0) {
+					debug(2, "Sending mouse up event to resource %d\n", _curResource);
+					_resources[_curResource]->handleMouseDown();
+				}
+				break;	
+			case Common::EVENT_KEYDOWN:
+				switch (event.kbd.keycode) {
+				case Common::KEYCODE_d:
+					if (event.kbd.flags & Common::KBD_CTRL) {
+						_console->attach();
+						_console->onFrame();
 					}
-					break;	
-				case Common::EVENT_KEYDOWN:
-					switch (event.kbd.keycode) {
-						case Common::KEYCODE_d:
-							if (event.kbd.flags & Common::KBD_CTRL) {
-								_console->attach();
-								_console->onFrame();
-							}
-							break;
-						case Common::KEYCODE_SPACE:
-							pauseGame();
-							break;
-						case Common::KEYCODE_F4:
-							_showResourceRects = !_showResourceRects;
-							if (_showResourceRects)
-								drawResourceRects();
-							break;
-						case Common::KEYCODE_F5:
-							runDialog(*_optionsDialog);
-							break;
-						default:
-							break;
-					}
 					break;
+				case Common::KEYCODE_SPACE:
+					pauseGame();
+					break;
+				case Common::KEYCODE_F4:
+					_showResourceRects = !_showResourceRects;
+					if (_showResourceRects)
+						drawResourceRects();
+					break;
+				case Common::KEYCODE_F5:
+					runDialog(*_optionsDialog);
+					break;
 				default:
 					break;
+				}
+				break;
+			default:
+				break;
 			}
 		}
 
@@ -527,18 +527,18 @@
 			debugC(kDebugView, "\t\t Type: %d", _view.scriptResources[i].type);
 
 			switch (_view.scriptResources[i].type) {
-				case 1:
-					debugC(kDebugView, "\t\t\t\t= Image");
-					break;
-				case 2:
-					debugC(kDebugView, "\t\t\t\t= Sound");
-					break;
-				case 3:
-					debugC(kDebugView, "\t\t\t\t= Resource List");
-					break;
-				default:
-					debugC(kDebugView, "\t\t\t\t= Unknown");
-					break;
+			case 1:
+				debugC(kDebugView, "\t\t\t\t= Image");
+				break;
+			case 2:
+				debugC(kDebugView, "\t\t\t\t= Sound");
+				break;
+			case 3:
+				debugC(kDebugView, "\t\t\t\t= Resource List");
+				break;
+			default:
+				debugC(kDebugView, "\t\t\t\t= Unknown");
+				break;
 			}
 
 			if (_view.scriptResources[i].type == 3) {
@@ -839,31 +839,31 @@
 	debugC(kDebugResource, "\tSub_Record: %d", (parent == NULL) ? 0 : 1);
 
 	switch (type) {
-		case kMystForwardResource:
-		case kMystLeftResource:
-		case kMystRightResource:
-		case kMystDownResource:
-		case kMystUpResource:
-		case 14: // TODO: kMystBackwardResource?
-			return new MystResource(vm, rlstStream, parent);
-		case kMystActionResource:
-			return new MystResourceType5(vm, rlstStream, parent);
-		case kMystVideoResource:
-			return new MystResourceType6(vm, rlstStream, parent);
-		case kMystSwitchResource:
-			return new MystResourceType7(vm, rlstStream, parent);
-		case 8:
-			return new MystResourceType8(vm, rlstStream, parent);
-		case 10:
-			return new MystResourceType10(vm, rlstStream, parent);
-		case 11:
-			return new MystResourceType11(vm, rlstStream, parent);
-		case 12:
-			return new MystResourceType12(vm, rlstStream, parent);
-		case 13:
-			return new MystResourceType13(vm, rlstStream, parent);
-		default:
-			error ("Unknown/Unhandled MystResource type %d", type);
+	case kMystForwardResource:
+	case kMystLeftResource:
+	case kMystRightResource:
+	case kMystDownResource:
+	case kMystUpResource:
+	case 14: // TODO: kMystBackwardResource?
+		return new MystResource(vm, rlstStream, parent);
+	case kMystActionResource:
+		return new MystResourceType5(vm, rlstStream, parent);
+	case kMystVideoResource:
+		return new MystResourceType6(vm, rlstStream, parent);
+	case kMystSwitchResource:
+		return new MystResourceType7(vm, rlstStream, parent);
+	case 8:
+		return new MystResourceType8(vm, rlstStream, parent);
+	case 10:
+		return new MystResourceType10(vm, rlstStream, parent);
+	case 11:
+		return new MystResourceType11(vm, rlstStream, parent);
+	case 12:
+		return new MystResourceType12(vm, rlstStream, parent);
+	case 13:
+		return new MystResourceType13(vm, rlstStream, parent);
+	default:
+		error ("Unknown/Unhandled MystResource type %d", type);
 	}
 }
 

Modified: scummvm/trunk/engines/mohawk/myst_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_scripts.cpp	2009-12-30 07:00:16 UTC (rev 46733)
+++ scummvm/trunk/engines/mohawk/myst_scripts.cpp	2009-12-30 07:14:09 UTC (rev 46734)
@@ -645,16 +645,16 @@
 		for (byte i = 0; i < argc; i++) {
 			debugC(kDebugScript, "\tResource %d Enable set to %d", i, argv[i]);
 			switch (argv[i]) {
-				case 0:
-					_vm->setResourceEnabled(i, false);
-					break;
-				case 1:
-					_vm->setResourceEnabled(i, true);
-					break;
-				default:
-					warning("Opcode %d u%d non-boolean", op, i);
-					_vm->setResourceEnabled(i, true);
-					break;
+			case 0:
+				_vm->setResourceEnabled(i, false);
+				break;
+			case 1:
+				_vm->setResourceEnabled(i, true);
+				break;
+			default:
+				warning("Opcode %d u%d non-boolean", op, i);
+				_vm->setResourceEnabled(i, true);
+				break;
 			}
 		}
 	} else
@@ -1108,21 +1108,21 @@
 		debugCN(kDebugScript, "\tupdateDirection: %d = ", updateDirection);
 		
 		switch (updateDirection) {
-			case 0:
-				debugC(kDebugScript, "Left to Right");
-				break;
-			case 1:
-				debugC(kDebugScript, "Right to Left");
-				break;
-			case 5:
-				debugC(kDebugScript, "Top to Bottom");
-				break;
-			case 6:
-				debugC(kDebugScript, "Bottom to Top");
-				break;
-			default:
-				warning("Unknown Update Direction");
-				break;
+		case 0:
+			debugC(kDebugScript, "Left to Right");
+			break;
+		case 1:
+			debugC(kDebugScript, "Right to Left");
+			break;
+		case 5:
+			debugC(kDebugScript, "Top to Bottom");
+			break;
+		case 6:
+			debugC(kDebugScript, "Bottom to Top");
+			break;
+		default:
+			warning("Unknown Update Direction");
+			break;
 		}
 		
 		debugC(kDebugScript, "\tu2: %d", u2); // TODO: Speed / Delay of Update?
@@ -1142,21 +1142,21 @@
 			debugCN(kDebugScript, "\tupdateDirection2: %d = ", updateDirection2);
 			 
 			switch (updateDirection2) {
-				case 0:
-					debugC(kDebugScript, "Left to Right");
-					break;
-				case 1:
-					debugC(kDebugScript, "Right to Left");
-					break;
-				case 5:
-					debugC(kDebugScript, "Top to Bottom");
-					break;
-				case 6:
-					debugC(kDebugScript, "Bottom to Top");
-					break;
-				default:
-					warning("Unknown Update Direction");
-					break;
+			case 0:
+				debugC(kDebugScript, "Left to Right");
+				break;
+			case 1:
+				debugC(kDebugScript, "Right to Left");
+				break;
+			case 5:
+				debugC(kDebugScript, "Top to Bottom");
+				break;
+			case 6:
+				debugC(kDebugScript, "Bottom to Top");
+				break;
+			default:
+				warning("Unknown Update Direction");
+				break;
 			}
 			
 			debugC(kDebugScript, "\tu3: %d", u3); // TODO: Speed / Delay of Update?
@@ -1205,21 +1205,21 @@
 		debugCN(kDebugScript, "\tupdateDirection: %d = ", updateDirection);
 		
 		switch (updateDirection) {
-			case 0:
-				debugC(kDebugScript, "Left to Right");
-				break;
-			case 1:
-				debugC(kDebugScript, "Right to Left");
-				break;
-			case 5:
-				debugC(kDebugScript, "Top to Bottom");
-				break;
-			case 6:
-				debugC(kDebugScript, "Bottom to Top");
-				break;
-			default:
-				warning("Unknown Update Direction");
-				break;
+		case 0:
+			debugC(kDebugScript, "Left to Right");
+			break;
+		case 1:
+			debugC(kDebugScript, "Right to Left");
+			break;
+		case 5:
+			debugC(kDebugScript, "Top to Bottom");
+			break;
+		case 6:
+			debugC(kDebugScript, "Bottom to Top");
+			break;
+		default:
+			warning("Unknown Update Direction");
+			break;
 		}
 		
 		debugC(kDebugScript, "\tu2: %d", u2); // TODO: Speed / Delay of Update?
@@ -1239,21 +1239,21 @@
 			debugCN(kDebugScript, "\tupdateDirection2: %d = ", updateDirection2);
 			
 			switch (updateDirection2) {
-				case 0:
-					debugC(kDebugScript, "Left to Right");
-					break;
-				case 1:
-					debugC(kDebugScript, "Right to Left");
-					break;
-				case 5:
-					debugC(kDebugScript, "Top to Bottom");
-					break;
-				case 6:
-					debugC(kDebugScript, "Bottom to Top");
-					break;
-				default:
-					warning("Unknown Update Direction");
-					break;
+			case 0:
+				debugC(kDebugScript, "Left to Right");
+				break;
+			case 1:
+				debugC(kDebugScript, "Right to Left");
+				break;
+			case 5:
+				debugC(kDebugScript, "Top to Bottom");
+				break;
+			case 6:
+				debugC(kDebugScript, "Bottom to Top");
+				break;
+			default:
+				warning("Unknown Update Direction");
+				break;
 			}
 			
 			debugC(kDebugScript, "\tu3: %d", u3); // TODO: Speed / Delay of Update?
@@ -1318,532 +1318,532 @@
 	const uint16 soundIdLinkSrc = 5;
 
 	switch (_vm->getCurStack()) {
-		case kIntroStack:
-			debugC(kDebugScript, "Opcode %d: ChangeStack", op);
-			debugC(kDebugScript, "\tvar: %d", var);
+	case kIntroStack:
+		debugC(kDebugScript, "Opcode %d: ChangeStack", op);
+		debugC(kDebugScript, "\tvar: %d", var);
 
-			// TODO: Merge with changeStack (Opcode 40) Implementation? 
-			if (_vm->_varStore->getVar(var) == 5 || _vm->_varStore->getVar(var) > 7) {
-				// TODO: Dead Book i.e. Released Sirrus/Achenar
-			} else {
-				// Play Linking Sound, blocking...
-				_vm->_sound->stopSound();
-				Audio::SoundHandle *handle = _vm->_sound->playSound(soundIdLinkSrc);
-				while (_vm->_mixer->isSoundHandleActive(*handle))
-					_vm->_system->delayMillis(10);
+		// TODO: Merge with changeStack (Opcode 40) Implementation? 
+		if (_vm->_varStore->getVar(var) == 5 || _vm->_varStore->getVar(var) > 7) {
+			// TODO: Dead Book i.e. Released Sirrus/Achenar
+		} else {
+			// Play Linking Sound, blocking...
+			_vm->_sound->stopSound();
+			Audio::SoundHandle *handle = _vm->_sound->playSound(soundIdLinkSrc);
+			while (_vm->_mixer->isSoundHandleActive(*handle))
+				_vm->_system->delayMillis(10);
 
-				// Play Flyby Entry Movie on Masterpiece Edition..
-				if ((_vm->getFeatures() & GF_ME)) {
-					switch (stack_map[_vm->_varStore->getVar(var)]) {
-						case kSeleniticStack:
-							_vm->_video->playMovieCentered(_vm->wrapMovieFilename("selenitic flyby", kMasterpieceOnly));
-							break;
-						case kStoneshipStack:
-							_vm->_video->playMovieCentered(_vm->wrapMovieFilename("stoneship flyby", kMasterpieceOnly));
-							break;
-						// Myst Flyby Movie not used in Original Masterpiece Edition Engine
-						case kMystStack:
-							if (_vm->_tweaksEnabled)
-								_vm->_video->playMovieCentered(_vm->wrapMovieFilename("myst flyby", kMasterpieceOnly));
-							break;
-						case kMechanicalStack:
-							_vm->_video->playMovieCentered(_vm->wrapMovieFilename("mech age flyby", kMasterpieceOnly));
-							break;
-						case kChannelwoodStack:
-							_vm->_video->playMovieCentered(_vm->wrapMovieFilename("channelwood flyby", kMasterpieceOnly));
-							break;
-						default:
-							break;
-					}
+			// Play Flyby Entry Movie on Masterpiece Edition..
+			if ((_vm->getFeatures() & GF_ME)) {
+				switch (stack_map[_vm->_varStore->getVar(var)]) {
+				case kSeleniticStack:
+					_vm->_video->playMovieCentered(_vm->wrapMovieFilename("selenitic flyby", kMasterpieceOnly));
+					break;
+				case kStoneshipStack:
+					_vm->_video->playMovieCentered(_vm->wrapMovieFilename("stoneship flyby", kMasterpieceOnly));
+					break;
+				// Myst Flyby Movie not used in Original Masterpiece Edition Engine
+				case kMystStack:
+					if (_vm->_tweaksEnabled)
+						_vm->_video->playMovieCentered(_vm->wrapMovieFilename("myst flyby", kMasterpieceOnly));
+					break;
+				case kMechanicalStack:
+					_vm->_video->playMovieCentered(_vm->wrapMovieFilename("mech age flyby", kMasterpieceOnly));
+					break;
+				case kChannelwoodStack:
+					_vm->_video->playMovieCentered(_vm->wrapMovieFilename("channelwood flyby", kMasterpieceOnly));
+					break;
+				default:
+					break;
 				}
+			}
 
-				uint16 varValue = _vm->_varStore->getVar(var);
-				_vm->changeToStack(stack_map[varValue]);
-				_vm->changeToCard(start_card[varValue]);
+			uint16 varValue = _vm->_varStore->getVar(var);
+			_vm->changeToStack(stack_map[varValue]);
+			_vm->changeToCard(start_card[varValue]);
 
-				// TODO: No soundIdLinkDst for Opcode 100 link? Check Original.
-			}
-			break;
-		case kStoneshipStack:
-			// Used for Cards 2185 (Water Pump)
-			varUnusedCheck(op, var);
+			// TODO: No soundIdLinkDst for Opcode 100 link? Check Original.
+		}
+		break;
+	case kStoneshipStack:
+		// Used for Cards 2185 (Water Pump)
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Unknown Function", op);
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Unknown Function", op);
 
-				// TODO: Called when Water Pump Button is pressed? Animation?
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kDniStack:
-			// Used in Card 5022 (Rocks)
-			varUnusedCheck(op, var);
+			// TODO: Called when Water Pump Button is pressed? Animation?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDniStack:
+		// Used in Card 5022 (Rocks)
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Unknown Function", op);
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Unknown Function", op);
 
-				// TODO: Fill in Logic.
-			} else
-				unknown(op, var, argc, argv);
-            break;
-		case kCreditsStack:
-		case kMakingOfStack:
-			_vm->_system->quit();
-			break;
-		case kDemoSlidesStack:
-			// TODO: Change to changeStack call?
-			_vm->changeToStack(kDemoStack);
-			_vm->changeToCard(2001);
-			break;
-		default:
+			// TODO: Fill in Logic.
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	case kCreditsStack:
+	case kMakingOfStack:
+		_vm->_system->quit();
+		break;
+	case kDemoSlidesStack:
+		// TODO: Change to changeStack call?
+		_vm->changeToStack(kDemoStack);
+		_vm->changeToCard(2001);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_101(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			varUnusedCheck(op, var);
+	case kSeleniticStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				// Used on Card 1191 (Maze Runner)
-				// Called when Red Warning Button is pushed
+		if (argc == 0) {
+			// Used on Card 1191 (Maze Runner)
+			// Called when Red Warning Button is pushed
 
-				debugC(kDebugScript, "Opcode %d: Repeat Buzzer Sound?", op);
+			debugC(kDebugScript, "Opcode %d: Repeat Buzzer Sound?", op);
 
-				// TODO: Fill in logic...
-				// Repeat buzzer sound
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+			// TODO: Fill in logic...
+			// Repeat buzzer sound
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 6) {
-				// Used by Door Buttons to Brothers' Rooms
-				// Cards 2294, 2255
-				Common::Rect u0_rect = Common::Rect(argv[0], argv[1], argv[2], argv[3]);
-				uint16 u1 = argv[3];
-				uint16 u2 = argv[2];
+		if (argc == 6) {
+			// Used by Door Buttons to Brothers' Rooms
+			// Cards 2294, 2255
+			Common::Rect u0_rect = Common::Rect(argv[0], argv[1], argv[2], argv[3]);
+			uint16 u1 = argv[3];
+			uint16 u2 = argv[2];
 
-				debugC(kDebugScript, "Opcode %d: Unknown", op);
-				debugC(kDebugScript, "u0_rect.left: %d", u0_rect.left);
-				debugC(kDebugScript, "u0_rect.top: %d", u0_rect.top);
-				debugC(kDebugScript, "u0_rect.right: %d", u0_rect.right);
-				debugC(kDebugScript, "u0_rect.bottom: %d", u0_rect.bottom);
-				debugC(kDebugScript, "u1: %d", u1);
-				debugC(kDebugScript, "u2: %d", u2);
+			debugC(kDebugScript, "Opcode %d: Unknown", op);
+			debugC(kDebugScript, "u0_rect.left: %d", u0_rect.left);
+			debugC(kDebugScript, "u0_rect.top: %d", u0_rect.top);
+			debugC(kDebugScript, "u0_rect.right: %d", u0_rect.right);
+			debugC(kDebugScript, "u0_rect.bottom: %d", u0_rect.bottom);
+			debugC(kDebugScript, "u1: %d", u1);
+			debugC(kDebugScript, "u2: %d", u2);
 
-				// TODO: Fill in logic...
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kDemoPreviewStack:
-		case kMystStack:
-			debugC(kDebugScript, "Opcode %d: Decrement Variable", op);
-			if (argc == 0) {
-				debugC(kDebugScript, "\tvar: %d", var);
-				uint16 varValue = _vm->_varStore->getVar(var);
-				// Logic to prevent decrement to negative
-				if (varValue != 0)
-					_vm->_varStore->setVar(var, varValue - 1);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			varUnusedCheck(op, var);
+			// TODO: Fill in logic...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDemoPreviewStack:
+	case kMystStack:
+		debugC(kDebugScript, "Opcode %d: Decrement Variable", op);
+		if (argc == 0) {
+			debugC(kDebugScript, "\tvar: %d", var);
+			uint16 varValue = _vm->_varStore->getVar(var);
+			// Logic to prevent decrement to negative
+			if (varValue != 0)
+				_vm->_varStore->setVar(var, varValue - 1);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 1) {
-				debugC(kDebugScript, "Opcode %d: Play Pipe Movie and Sound", op);
+		if (argc == 1) {
+			debugC(kDebugScript, "Opcode %d: Play Pipe Movie and Sound", op);
 
-				uint16 soundId = argv[0];
-				debugC(kDebugScript, "\tsoundId: %d", soundId);
+			uint16 soundId = argv[0];
+			debugC(kDebugScript, "\tsoundId: %d", soundId);
 
-				_vm->_sound->playSound(soundId);
+			_vm->_sound->playSound(soundId);
 
-				// TODO: Get Movie Location from Invoking Resource Rect, rather than
-				//       hardcoded 267, 170 ?
+			// TODO: Get Movie Location from Invoking Resource Rect, rather than
+			//       hardcoded 267, 170 ?
 
-				// TODO: Need version of playMovie blocking which allows selection
-				//       of start and finish points.
-				if (!_vm->_varStore->getVar(6)) {
-					// Play Pipe Extending i.e. 0 to 1/2 way through file
-					_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
-				} else {
-					// Play Pipe Retracting i.e. 1/2 way to end of file
-					_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kDniStack:
-			// Used in Card 5014 (Atrus)
-			// Hotspot Resource Used to hand Page to Atrus...
-			varUnusedCheck(op, var);
-			// TODO: Fill in Logic.
-            break;
-		case kDemoStack:
-			varUnusedCheck(op, var);
+			// TODO: Need version of playMovie blocking which allows selection
+			//       of start and finish points.
+			if (!_vm->_varStore->getVar(6)) {
+				// Play Pipe Extending i.e. 0 to 1/2 way through file
+				_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
+			} else {
+				// Play Pipe Retracting i.e. 1/2 way to end of file
+				_vm->_video->playMovie(_vm->wrapMovieFilename("pipebrid", kChannelwoodStack), 267, 170);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDniStack:
+		// Used in Card 5014 (Atrus)
+		// Hotspot Resource Used to hand Page to Atrus...
+		varUnusedCheck(op, var);
+		// TODO: Fill in Logic.
+		break;
+	case kDemoStack:
+		varUnusedCheck(op, var);
 
-			// Used on Card 2000, 2002 and 2003
-			// Triggered by Click
-			if (argc == 0) {
-				// TODO: Fill in Logic.. Fade in?
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+		// Used on Card 2000, 2002 and 2003
+		// Triggered by Click
+		if (argc == 0) {
+			// TODO: Fill in Logic.. Fade in?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_102(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 2) {
-				debugC(kDebugScript, "Opcode %d: Play Book Room Movie", op);
+		if (argc == 2) {
+			debugC(kDebugScript, "Opcode %d: Play Book Room Movie", op);
 
-				uint16 startTime = argv[0];
-				uint16 endTime = argv[1];
+			uint16 startTime = argv[0];
+			uint16 endTime = argv[1];
 
-				debugC(kDebugScript, "\tstartTime: %d", startTime);
-				debugC(kDebugScript, "\tendTime: %d", endTime);
+			debugC(kDebugScript, "\tstartTime: %d", startTime);
+			debugC(kDebugScript, "\tendTime: %d", endTime);
 
-				printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, startTime, endTime);
-				// TODO: Need version of playMovie blocking which allows selection
-				//       of start and finish points.
-				_vm->_video->playMovie(_vm->wrapMovieFilename("bkroom", kStoneshipStack), 159, 99);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kDemoPreviewStack:
-		case kMystStack:
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Increment Variable", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, startTime, endTime);
+			// TODO: Need version of playMovie blocking which allows selection
+			//       of start and finish points.
+			_vm->_video->playMovie(_vm->wrapMovieFilename("bkroom", kStoneshipStack), 159, 99);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDemoPreviewStack:
+	case kMystStack:
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Increment Variable", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// AFAIK no logic to put ceiling on increment at least in this opcode
-				_vm->_varStore->setVar(var, _vm->_varStore->getVar(var) + 1);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			varUnusedCheck(op, var);
+			// AFAIK no logic to put ceiling on increment at least in this opcode
+			_vm->_varStore->setVar(var, _vm->_varStore->getVar(var) + 1);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 2 || argc == 3) {
-				debugC(kDebugScript, "Opcode %d: Draw Full Screen Image, Optional Delay and Change Card", op);
+		if (argc == 2 || argc == 3) {
+			debugC(kDebugScript, "Opcode %d: Draw Full Screen Image, Optional Delay and Change Card", op);
 
-				uint16 imageId = argv[0];
-				uint16 cardId = argv[1];
-				uint16 delay = 0;
-				
-				if (argc == 3)
-					delay = argv[2]; // TODO: Not sure about purpose of this parameter...
+			uint16 imageId = argv[0];
+			uint16 cardId = argv[1];
+			uint16 delay = 0;
 
-				debugC(kDebugScript, "\timageId: %d", imageId);
-				debugC(kDebugScript, "\tcardId: %d", cardId);
-				debugC(kDebugScript, "\tdelay: %d", delay);
+			if (argc == 3)
+				delay = argv[2]; // TODO: Not sure about purpose of this parameter...
 
-				_vm->_gfx->copyImageToScreen(imageId, Common::Rect(0, 0, 544, 333));
-				_vm->_system->delayMillis(delay / 100);
-				_vm->changeToCard(cardId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kDemoStack:
-			varUnusedCheck(op, var);
+			debugC(kDebugScript, "\timageId: %d", imageId);
+			debugC(kDebugScript, "\tcardId: %d", cardId);
+			debugC(kDebugScript, "\tdelay: %d", delay);
 
-			// Used on Card 2002 and 2003
-			// Triggered by Click
-			if (argc == 0) {
-				// TODO: Fill in Logic.. Fade out?
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			_vm->_gfx->copyImageToScreen(imageId, Common::Rect(0, 0, 544, 333));
+			_vm->_system->delayMillis(delay / 100);
+			_vm->changeToCard(cardId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDemoStack:
+		varUnusedCheck(op, var);
+
+		// Used on Card 2002 and 2003
+		// Triggered by Click
+		if (argc == 0) {
+			// TODO: Fill in Logic.. Fade out?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_103(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 1) {
-				// Used on Card 2197 (Sirrus' Room Drawers)
-				debugC(kDebugScript, "Opcode %d: Unknown", op);
+		if (argc == 1) {
+			// Used on Card 2197 (Sirrus' Room Drawers)
+			debugC(kDebugScript, "Opcode %d: Unknown", op);
 
-				uint16 u0 = argv[0];
+			uint16 u0 = argv[0];
 
-				debugC(kDebugScript, "\tu0: %d", u0);
-				// TODO: Fill in Logic...
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kDemoPreviewStack:
-		case kMystStack:
-			// Used on Myst Card 4162 (Fireplace Grid)
-			if (argc == 1) {
-				debugC(kDebugScript, "Opcode %d: Toggle Variable with Bitmask", op);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			// TODO: Fill in Logic...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDemoPreviewStack:
+	case kMystStack:
+		// Used on Myst Card 4162 (Fireplace Grid)
+		if (argc == 1) {
+			debugC(kDebugScript, "Opcode %d: Toggle Variable with Bitmask", op);
 
-				uint16 bitmask = argv[0];
-				uint16 varValue = _vm->_varStore->getVar(var);
+			uint16 bitmask = argv[0];
+			uint16 varValue = _vm->_varStore->getVar(var);
 
-				debugC(kDebugScript, "\tvar: %d", var);
-				debugC(kDebugScript, "\tbitmask: 0x%02X", bitmask);
+			debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "\tbitmask: 0x%02X", bitmask);
 
-				if (varValue & bitmask)
-					_vm->_varStore->setVar(var, varValue & ~bitmask);
-				else
-					_vm->_varStore->setVar(var, varValue | bitmask);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			if (varValue & bitmask)
+				_vm->_varStore->setVar(var, varValue & ~bitmask);
+			else
+				_vm->_varStore->setVar(var, varValue | bitmask);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_104(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			// Used for Card 2004 (Achenar's Room Drawers)
-			// Used for Closeup of Torn Note?
-			if (argc == 1) {
-				debugC(kDebugScript, "Opcode %d: Unknown Function", op);
-				
-				uint16 u0 = argv[0];
-				debugC(kDebugScript, "\tu0: %d", u0);
+		// Used for Card 2004 (Achenar's Room Drawers)
+		// Used for Closeup of Torn Note?
+		if (argc == 1) {
+			debugC(kDebugScript, "Opcode %d: Unknown Function", op);
 
-				// TODO: Fill in Function...
-				// Does u0 correspond to a resource Id? Enable? Disable?
-				// Similar to Opcode 111 (Stoneship Version).. But does this also
-				// draw closeup image of note / change to closeup card?
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			varUnusedCheck(op, var);
+			uint16 u0 = argv[0];
+			debugC(kDebugScript, "\tu0: %d", u0);
 
-			// Used on Myst Card 4162 and 4166 (Fireplace Puzzle Rotation Movies)
-			if (argc == 1) {
-				debugC(kDebugScript, "Opcode %d: Play Fireplace Puzzle Rotation Movies", op);
+			// TODO: Fill in Function...
+			// Does u0 correspond to a resource Id? Enable? Disable?
+			// Similar to Opcode 111 (Stoneship Version).. But does this also
+			// draw closeup image of note / change to closeup card?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		varUnusedCheck(op, var);
 
-				uint16 movieNum = argv[0];
-				debugC(kDebugScript, "\tmovieNum: %d", movieNum);
+		// Used on Myst Card 4162 and 4166 (Fireplace Puzzle Rotation Movies)
+		if (argc == 1) {
+			debugC(kDebugScript, "Opcode %d: Play Fireplace Puzzle Rotation Movies", op);
 
-            	if (movieNum == 0)
-					_vm->_video->playMovie(_vm->wrapMovieFilename("fpin", kMystStack), 167, 5);
-				if (movieNum == 1)
-					_vm->_video->playMovie(_vm->wrapMovieFilename("fpout", kMystStack), 167, 5);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			varUnusedCheck(op, var);
+			uint16 movieNum = argv[0];
+			debugC(kDebugScript, "\tmovieNum: %d", movieNum);
 
-			// Used on Mechanical Card 6043 (Weapons Rack with Snake Box)
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Trigger Playing Of Snake Movie", op);
+			if (movieNum == 0)
+				_vm->_video->playMovie(_vm->wrapMovieFilename("fpin", kMystStack), 167, 5);
+			if (movieNum == 1)
+				_vm->_video->playMovie(_vm->wrapMovieFilename("fpout", kMystStack), 167, 5);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		varUnusedCheck(op, var);
 
-				// TODO: Trigger Type 6 To Play Snake Movie.. Resource #3 on card.
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			varUnusedCheck(op, var);
+		// Used on Mechanical Card 6043 (Weapons Rack with Snake Box)
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Trigger Playing Of Snake Movie", op);
 
-			// Used on Channelwood Card 3280
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Do Water Tank Valve Open Animation", op);
-				Common::Rect rect = _invokingResource->getRect();
+			// TODO: Trigger Type 6 To Play Snake Movie.. Resource #3 on card.
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		varUnusedCheck(op, var);
 
-				// TODO: Need to load the image ids from Script Resources structure of VIEW
-				for (uint16 imageId = 3595; imageId <= 3601; imageId++) { 
-					_vm->_gfx->copyImageToScreen(imageId, rect);
-					_vm->_system->delayMillis(50);
-				}
-				
-				// TODO: Is 8 gotten from var7 of calling hotspot, rather than hardcoded?
-				_vm->_varStore->setVar(8, 1);
-				_vm->_varStore->setVar(19, 1);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+		// Used on Channelwood Card 3280
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Do Water Tank Valve Open Animation", op);
+			Common::Rect rect = _invokingResource->getRect();
+
+			// TODO: Need to load the image ids from Script Resources structure of VIEW
+			for (uint16 imageId = 3595; imageId <= 3601; imageId++) { 
+				_vm->_gfx->copyImageToScreen(imageId, rect);
+				_vm->_system->delayMillis(50);
+			}
+
+			// TODO: Is 8 gotten from var7 of calling hotspot, rather than hardcoded?
+			_vm->_varStore->setVar(8, 1);
+			_vm->_varStore->setVar(19, 1);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_105(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 1) {
-				uint16 soundId = argv[0];
+	case kSeleniticStack:
+		if (argc == 1) {
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Sound Receiver Water Button", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "Opcode %d: Sound Receiver Water Button", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// TODO: Complete Function including Var Change?
-				_vm->_sound->playSound(soundId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			if (argc == 1) {
-				varUnusedCheck(op, var);
+			// TODO: Complete Function including Var Change?
+			_vm->_sound->playSound(soundId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		if (argc == 1) {
+			varUnusedCheck(op, var);
 
-				uint16 soundId = argv[0];
-				uint16 boxValue = 0;
-				Audio::SoundHandle *handle;
+			uint16 soundId = argv[0];
+			uint16 boxValue = 0;
+			Audio::SoundHandle *handle;
 
-				debugC(kDebugScript, "Opcode %d: Ship Puzzle Logic", op);
-				debugC(kDebugScript, "\tsoundId: %d", soundId);
+			debugC(kDebugScript, "Opcode %d: Ship Puzzle Logic", op);
+			debugC(kDebugScript, "\tsoundId: %d", soundId);
 
-				// Logic for Myst Ship Box Puzzle Solution
-				for (byte i = 0; i < 8; i++)
-					boxValue |= _vm->_varStore->getVar(i + 26) ? (1 << i) : 0;
+			// Logic for Myst Ship Box Puzzle Solution
+			for (byte i = 0; i < 8; i++)
+				boxValue |= _vm->_varStore->getVar(i + 26) ? (1 << i) : 0;
 
-				uint16 var10 = _vm->_varStore->getVar(10);
+			uint16 var10 = _vm->_varStore->getVar(10);
 
-				if (boxValue == 0x32 && var10 == 0) {
-					handle = _vm->_sound->playSound(soundId);
+			if (boxValue == 0x32 && var10 == 0) {
+				handle = _vm->_sound->playSound(soundId);
 
-					while (_vm->_mixer->isSoundHandleActive(*handle))
-						_vm->_system->delayMillis(10);
+				while (_vm->_mixer->isSoundHandleActive(*handle))
+					_vm->_system->delayMillis(10);
 
-					_vm->_varStore->setVar(10, 1);
-				} else if (boxValue != 0x32 && var10 == 1) {
-					handle = _vm->_sound->playSound(soundId);
+				_vm->_varStore->setVar(10, 1);
+			} else if (boxValue != 0x32 && var10 == 1) {
+				handle = _vm->_sound->playSound(soundId);
 
-					while (_vm->_mixer->isSoundHandleActive(*handle))
-						_vm->_system->delayMillis(10);
+				while (_vm->_mixer->isSoundHandleActive(*handle))
+					_vm->_system->delayMillis(10);
 
-					_vm->_varStore->setVar(10, 0);
-				}
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			varUnusedCheck(op, var);
+				_vm->_varStore->setVar(10, 0);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Play Stairs Movement Movie", op);
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Play Stairs Movement Movie", op);
 
-				if (_vm->_varStore->getVar(10)) {
-					// TODO: Play Movie from 0 to 1/2 way...
-					_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
-				} else {
-					// TODO: Play Movie from 1/2 way to end...
-					_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
-				}
+			if (_vm->_varStore->getVar(10)) {
+				// TODO: Play Movie from 0 to 1/2 way...
+				_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
+			} else {
+				// TODO: Play Movie from 1/2 way to end...
+				_vm->_video->playMovie(_vm->wrapMovieFilename("hhstairs", kMechanicalStack), 174, 222);
 			}
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+		}
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_106(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 1) {
-				uint16 soundId = argv[0];
+	case kSeleniticStack:
+		if (argc == 1) {
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Sound Receiver Volcanic Crack Button", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "Opcode %d: Sound Receiver Volcanic Crack Button", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// TODO: Complete Function including Var Change?
-				_vm->_sound->playSound(soundId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Complete Function including Var Change?
+			_vm->_sound->playSound(soundId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_107(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 1) {
-				uint16 soundId = argv[0];
+	case kSeleniticStack:
+		if (argc == 1) {
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Sound Receiver Clock Button", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "Opcode %d: Sound Receiver Clock Button", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// TODO: Complete Function including Var Change?
-				_vm->_sound->playSound(soundId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Complete Function including Var Change?
+			_vm->_sound->playSound(soundId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_108(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 1) {
-				uint16 soundId = argv[0];
+	case kSeleniticStack:
+		if (argc == 1) {
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Sound Receiver Crystal Rocks Button", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "Opcode %d: Sound Receiver Crystal Rocks Button", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// TODO: Complete Function including Var Change?
-				_vm->_sound->playSound(soundId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Complete Function including Var Change?
+			_vm->_sound->playSound(soundId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_109(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 1) {
-				uint16 soundId = argv[0];
+	case kSeleniticStack:
+		if (argc == 1) {
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Sound Receiver Wind Button", op);
-				debugC(kDebugScript, "\tvar: %d", var);
+			debugC(kDebugScript, "Opcode %d: Sound Receiver Wind Button", op);
+			debugC(kDebugScript, "\tvar: %d", var);
 
-				// TODO: Complete Function including Var Change?
-				_vm->_sound->playSound(soundId);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			if (argc == 1) {
-				int16 signedValue = argv[0];
+			// TODO: Complete Function including Var Change?
+			_vm->_sound->playSound(soundId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		if (argc == 1) {
+			int16 signedValue = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Add Signed Value to Var", op);
-				debugC(kDebugScript, "\tVar: %d", var);
-				debugC(kDebugScript, "\tsignedValue: %d", signedValue);
+			debugC(kDebugScript, "Opcode %d: Add Signed Value to Var", op);
+			debugC(kDebugScript, "\tVar: %d", var);
+			debugC(kDebugScript, "\tsignedValue: %d", signedValue);
 
-				_vm->_varStore->setVar(var, _vm->_varStore->getVar(var) + signedValue);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			_vm->_varStore->setVar(var, _vm->_varStore->getVar(var) + signedValue);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -1851,47 +1851,47 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 15) {
-				// Used for Selenitic Maze Runner Exit Logic
-				uint16 CardIdEntry = argv[0];
-				uint16 CardIdExit = argv[1];
-				uint16 u0 = argv[2];
-				Common::Rect rect1 = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
-				uint16 rect1UpdateDirection = argv[7];
-				uint16 u1 = argv[8];
-				Common::Rect rect2 = Common::Rect(argv[9], argv[10], argv[11], argv[12]);
-				uint16 rect2UpdateDirection = argv[13];
-				uint16 u2 = argv[14];
+	case kSeleniticStack:
+		if (argc == 15) {
+			// Used for Selenitic Maze Runner Exit Logic
+			uint16 CardIdEntry = argv[0];
+			uint16 CardIdExit = argv[1];
+			uint16 u0 = argv[2];
+			Common::Rect rect1 = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
+			uint16 rect1UpdateDirection = argv[7];
+			uint16 u1 = argv[8];
+			Common::Rect rect2 = Common::Rect(argv[9], argv[10], argv[11], argv[12]);
+			uint16 rect2UpdateDirection = argv[13];
+			uint16 u2 = argv[14];
 
-				debugC(kDebugScript, "Opcode %d: Maze Runner Exit Logic and Door Open Animation", op);
-				debugC(kDebugScript, "\tExit Card: %d", CardIdEntry);
-				debugC(kDebugScript, "\tEntry Card: %d", CardIdExit);
-				debugC(kDebugScript, "\tu0 (Exit Var?): %d", u0);
+			debugC(kDebugScript, "Opcode %d: Maze Runner Exit Logic and Door Open Animation", op);
+			debugC(kDebugScript, "\tExit Card: %d", CardIdEntry);
+			debugC(kDebugScript, "\tEntry Card: %d", CardIdExit);
+			debugC(kDebugScript, "\tu0 (Exit Var?): %d", u0);
 
-				debugC(kDebugScript, "\trect1.left: %d", rect1.left);
-				debugC(kDebugScript, "\trect1.top: %d", rect1.top);
-				debugC(kDebugScript, "\trect1.right: %d", rect1.right);
-				debugC(kDebugScript, "\trect1.bottom: %d", rect1.bottom);
-				debugC(kDebugScript, "\trect1 updateDirection: %d", rect1UpdateDirection);
-				debugC(kDebugScript, "\tu1: %d", u1);
+			debugC(kDebugScript, "\trect1.left: %d", rect1.left);
+			debugC(kDebugScript, "\trect1.top: %d", rect1.top);
+			debugC(kDebugScript, "\trect1.right: %d", rect1.right);
+			debugC(kDebugScript, "\trect1.bottom: %d", rect1.bottom);
+			debugC(kDebugScript, "\trect1 updateDirection: %d", rect1UpdateDirection);
+			debugC(kDebugScript, "\tu1: %d", u1);
 
-				debugC(kDebugScript, "\trect2.left: %d", rect2.left);
-				debugC(kDebugScript, "\trect2.top: %d", rect2.top);
-				debugC(kDebugScript, "\trect2.right: %d", rect2.right);
-				debugC(kDebugScript, "\trect2.bottom: %d", rect2.bottom);
-				debugC(kDebugScript, "\trect2 updateDirection: %d", rect2UpdateDirection);
-				debugC(kDebugScript, "\tu2: %d", u2);
+			debugC(kDebugScript, "\trect2.left: %d", rect2.left);
+			debugC(kDebugScript, "\trect2.top: %d", rect2.top);
+			debugC(kDebugScript, "\trect2.right: %d", rect2.right);
+			debugC(kDebugScript, "\trect2.bottom: %d", rect2.bottom);
+			debugC(kDebugScript, "\trect2 updateDirection: %d", rect2UpdateDirection);
+			debugC(kDebugScript, "\tu2: %d", u2);
 
-				// TODO: Finish Implementing Logic...
-				// HACK: Bypass Higher Logic for now...
-				_vm->changeToCard(argv[1]);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Finish Implementing Logic...
+			// HACK: Bypass Higher Logic for now...
+			_vm->changeToCard(argv[1]);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -1899,63 +1899,63 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			if (argc == 0) {
-				// Used on Card 1245 (Sound Receiver)
-				// Used by Source Selection Buttons...
+	case kSeleniticStack:
+		if (argc == 0) {
+			// Used on Card 1245 (Sound Receiver)
+			// Used by Source Selection Buttons...
 
-				debugC(kDebugScript, "Opcode %d: Unknown", op);
-				// TODO: Fill in Function...
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kStoneshipStack:
-			if (argc == 1) {
-				// Used for Card 2004 (Achenar's Room Drawers)
-				// Used by Drawers Hotspots...
+			debugC(kDebugScript, "Opcode %d: Unknown", op);
+			// TODO: Fill in Function...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kStoneshipStack:
+		if (argc == 1) {
+			// Used for Card 2004 (Achenar's Room Drawers)
+			// Used by Drawers Hotspots...
 
-				debugC(kDebugScript, "Opcode %d: Unknown Function", op);
+			debugC(kDebugScript, "Opcode %d: Unknown Function", op);
 				
-				uint16 u0 = argv[0];
-				debugC(kDebugScript, "\tu0: %d", u0);
+			uint16 u0 = argv[0];
+			debugC(kDebugScript, "\tu0: %d", u0);
 
-				// TODO: Fill in Function...
-				// Does u0 correspond to a resource Id? Enable? Disable?
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Function...
+			// Does u0 correspond to a resource Id? Enable? Disable?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_112(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			// Used for Card 2013 (Achenar's Rose-Skull Hologram)
-			if (argc == 3) {
-				debugC(kDebugScript, "Opcode %d: Rose-Skull Hologram Playback", op);
+	case kStoneshipStack:
+		// Used for Card 2013 (Achenar's Rose-Skull Hologram)
+		if (argc == 3) {
+			debugC(kDebugScript, "Opcode %d: Rose-Skull Hologram Playback", op);
 				
-				uint16 varValue = _vm->_varStore->getVar(var);
+			uint16 varValue = _vm->_varStore->getVar(var);
 
-				debugC(kDebugScript, "\tVar: %d = %d", var, varValue);
+			debugC(kDebugScript, "\tVar: %d = %d", var, varValue);
 				
-				uint16 startPoint = argv[0];
-				uint16 endPoint = argv[1];
-				uint16 u0 = argv[2];
+			uint16 startPoint = argv[0];
+			uint16 endPoint = argv[1];
+			uint16 u0 = argv[2];
 
-				debugC(kDebugScript, "\tstartPoint: %d", startPoint);
-				debugC(kDebugScript, "\tendPoint: %d", endPoint);
-				debugC(kDebugScript, "\tu0: %d", u0);
+			debugC(kDebugScript, "\tstartPoint: %d", startPoint);
+			debugC(kDebugScript, "\tendPoint: %d", endPoint);
+			debugC(kDebugScript, "\tu0: %d", u0);
 
-				// TODO: Fill in Function...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Function...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -1963,52 +1963,52 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMystStack:
-			// Used on Myst 4143 (Dock near Marker Switch)
-			if (argc == 9) {
-				uint16 soundId = argv[0];
+	case kMystStack:
+		// Used on Myst 4143 (Dock near Marker Switch)
+		if (argc == 9) {
+			uint16 soundId = argv[0];
 				
-				uint16 u0 = argv[1];
-				uint16 u1 = argv[2];
+			uint16 u0 = argv[1];
+			uint16 u1 = argv[2];
 
-				Common::Rect rect = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
+			Common::Rect rect = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
 
-				uint16 updateDirection = argv[7];
-				uint16 u2 = argv[8];
+			uint16 updateDirection = argv[7];
+			uint16 u2 = argv[8];
 				
-				debugC(kDebugScript, "Opcode %d: Vault Open Logic", op);
-				debugC(kDebugScript, "\tsoundId: %d", soundId);
-				debugC(kDebugScript, "\tu0: %d", u0);
-				debugC(kDebugScript, "\tu1: %d", u1);
+			debugC(kDebugScript, "Opcode %d: Vault Open Logic", op);
+			debugC(kDebugScript, "\tsoundId: %d", soundId);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			debugC(kDebugScript, "\tu1: %d", u1);
 
-				debugC(kDebugScript, "\trect.left: %d", rect.left);
-				debugC(kDebugScript, "\trect.top: %d", rect.top);
-				debugC(kDebugScript, "\trect.right: %d", rect.right);
-				debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
-				debugC(kDebugScript, "\trect updateDirection: %d", updateDirection);
-				debugC(kDebugScript, "\tu2: %d", u2);
+			debugC(kDebugScript, "\trect.left: %d", rect.left);
+			debugC(kDebugScript, "\trect.top: %d", rect.top);
+			debugC(kDebugScript, "\trect.right: %d", rect.right);
+			debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
+			debugC(kDebugScript, "\trect updateDirection: %d", updateDirection);
+			debugC(kDebugScript, "\tu2: %d", u2);
 
-				if ((_vm->_varStore->getVar(2) == 1) &&
-				   (_vm->_varStore->getVar(3) == 1) &&
-				   (_vm->_varStore->getVar(4) == 0) &&
-				   (_vm->_varStore->getVar(5) == 1) &&
-				   (_vm->_varStore->getVar(6) == 1) &&
-				   (_vm->_varStore->getVar(7) == 1) &&
-				   (_vm->_varStore->getVar(8) == 1) &&
-				   (_vm->_varStore->getVar(9) == 1)) {
-					// TODO: Implement correct function...
-					// Blit Image in Left to Right Vertical stripes i.e. transistion
-					// like door opening
-					_vm->_sound->playSound(soundId);
-					// TODO: Set 41 to 1 if page already present in hand.
-					_vm->_varStore->setVar(41, 2);
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			if ((_vm->_varStore->getVar(2) == 1) &&
+			   (_vm->_varStore->getVar(3) == 1) &&
+			   (_vm->_varStore->getVar(4) == 0) &&
+			   (_vm->_varStore->getVar(5) == 1) &&
+			   (_vm->_varStore->getVar(6) == 1) &&
+			   (_vm->_varStore->getVar(7) == 1) &&
+			   (_vm->_varStore->getVar(8) == 1) &&
+			   (_vm->_varStore->getVar(9) == 1)) {
+				// TODO: Implement correct function...
+				// Blit Image in Left to Right Vertical stripes i.e. transistion
+				// like door opening
+				_vm->_sound->playSound(soundId);
+				// TODO: Set 41 to 1 if page already present in hand.
+				_vm->_varStore->setVar(41, 2);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2016,135 +2016,135 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMystStack:
-			// Used on Myst 4143 (Dock near Marker Switch)
-			if (argc == 9) {
-				uint16 soundId = argv[0];
+	case kMystStack:
+		// Used on Myst 4143 (Dock near Marker Switch)
+		if (argc == 9) {
+			uint16 soundId = argv[0];
 				
-				uint16 u0 = argv[1];
-				uint16 u1 = argv[2];
+			uint16 u0 = argv[1];
+			uint16 u1 = argv[2];
 
-				Common::Rect rect = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
+			Common::Rect rect = Common::Rect(argv[3], argv[4], argv[5], argv[6]);
 
-				uint16 updateDirection = argv[7];
-				uint16 u2 = argv[8];
-				
-				debugC(kDebugScript, "Opcode %d: Vault Close Logic", op);
-				debugC(kDebugScript, "\tsoundId: %d", soundId);
-				debugC(kDebugScript, "\tu0: %d", u0);
-				debugC(kDebugScript, "\tu1: %d", u1);
+			uint16 updateDirection = argv[7];
+			uint16 u2 = argv[8];
+			
+			debugC(kDebugScript, "Opcode %d: Vault Close Logic", op);
+			debugC(kDebugScript, "\tsoundId: %d", soundId);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			debugC(kDebugScript, "\tu1: %d", u1);
 
-				debugC(kDebugScript, "\trect.left: %d", rect.left);
-				debugC(kDebugScript, "\trect.top: %d", rect.top);
-				debugC(kDebugScript, "\trect.right: %d", rect.right);
-				debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
-				debugC(kDebugScript, "\tupdateDirection: %d", updateDirection);
-				debugC(kDebugScript, "\tu2: %d", u2);
+			debugC(kDebugScript, "\trect.left: %d", rect.left);
+			debugC(kDebugScript, "\trect.top: %d", rect.top);
+			debugC(kDebugScript, "\trect.right: %d", rect.right);
+			debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
+			debugC(kDebugScript, "\tupdateDirection: %d", updateDirection);
+			debugC(kDebugScript, "\tu2: %d", u2);
 
-				if ((_vm->_varStore->getVar(2) == 1) &&
-				   (_vm->_varStore->getVar(3) == 1) &&
-				   (_vm->_varStore->getVar(4) == 1) &&
-				   (_vm->_varStore->getVar(5) == 1) &&
-				   (_vm->_varStore->getVar(6) == 1) &&
-				   (_vm->_varStore->getVar(7) == 1) &&
-				   (_vm->_varStore->getVar(8) == 1) &&
-				   (_vm->_varStore->getVar(9) == 1)) {
-					// TODO: Implement correct function...
-					// Blit Image in Right to Left Vertical stripes i.e. transistion
-					// like door closing
-					_vm->_sound->playSound(soundId);
-					_vm->_varStore->setVar(41, 0);
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			if ((_vm->_varStore->getVar(2) == 1) &&
+			   (_vm->_varStore->getVar(3) == 1) &&
+			   (_vm->_varStore->getVar(4) == 1) &&
+			   (_vm->_varStore->getVar(5) == 1) &&
+			   (_vm->_varStore->getVar(6) == 1) &&
+			   (_vm->_varStore->getVar(7) == 1) &&
+			   (_vm->_varStore->getVar(8) == 1) &&
+			   (_vm->_varStore->getVar(9) == 1)) {
+				// TODO: Implement correct function...
+				// Blit Image in Right to Left Vertical stripes i.e. transistion
+				// like door closing
+				_vm->_sound->playSound(soundId);
+				_vm->_varStore->setVar(41, 0);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_115(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kSeleniticStack:
-			varUnusedCheck(op, var);
+	case kSeleniticStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 11) {
-				// Used for Selenitic Card 1147 (Musical Door Lock Button)
-				uint16 imageIdClose = argv[0]; // TODO: Sound Id?
-				uint16 imageIdOpen = argv[1]; // TODO: Sound Id?
+		if (argc == 11) {
+			// Used for Selenitic Card 1147 (Musical Door Lock Button)
+			uint16 imageIdClose = argv[0]; // TODO: Sound Id?
+			uint16 imageIdOpen = argv[1]; // TODO: Sound Id?
 
-				uint16 cardIdOpen = argv[2];
+			uint16 cardIdOpen = argv[2];
 
-				uint16 u0 = argv[3];
-				uint16 u1 = argv[4];
+			uint16 u0 = argv[3];
+			uint16 u1 = argv[4];
 
-				Common::Rect rect = Common::Rect(argv[5], argv[6], argv[7], argv[8]);
+			Common::Rect rect = Common::Rect(argv[5], argv[6], argv[7], argv[8]);
 
-				uint16 updateDirection = argv[9];
-				uint16 u2 = argv[10];
+			uint16 updateDirection = argv[9];
+			uint16 u2 = argv[10];
 
-				debugC(kDebugScript, "Music Door Lock Logic...");
-				debugC(kDebugScript, "\timageId (Close): %d", imageIdClose);
-				debugC(kDebugScript, "\timageId (Open): %d", imageIdOpen);
-				debugC(kDebugScript, "\tcardId (Open): %d", cardIdOpen);
-				debugC(kDebugScript, "\tu0: %d", u0);
-				debugC(kDebugScript, "\tu1: %d", u1);
+			debugC(kDebugScript, "Music Door Lock Logic...");
+			debugC(kDebugScript, "\timageId (Close): %d", imageIdClose);
+			debugC(kDebugScript, "\timageId (Open): %d", imageIdOpen);
+			debugC(kDebugScript, "\tcardId (Open): %d", cardIdOpen);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			debugC(kDebugScript, "\tu1: %d", u1);
 
-				debugC(kDebugScript, "\trect.left: %d", rect.left);
-				debugC(kDebugScript, "\trect.top: %d", rect.top);
-				debugC(kDebugScript, "\trect.right: %d", rect.right);
-				debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
-				debugC(kDebugScript, "\trect updateDirection: %d", updateDirection);
-				debugC(kDebugScript, "\tu2: %d", u2);
+			debugC(kDebugScript, "\trect.left: %d", rect.left);
+			debugC(kDebugScript, "\trect.top: %d", rect.top);
+			debugC(kDebugScript, "\trect.right: %d", rect.right);
+			debugC(kDebugScript, "\trect.bottom: %d", rect.bottom);
+			debugC(kDebugScript, "\trect updateDirection: %d", updateDirection);
+			debugC(kDebugScript, "\tu2: %d", u2);
 
-				// TODO: Fix Logic...
-				// HACK: Bypass Door Lock For Now
-				_vm->changeToCard(cardIdOpen);
-			} else
-				unknown(op, var, argc, argv);
-            break;
-		case kDemoPreviewStack:
-		case kMystStack:
-			if (argc == 3) {
-				uint16 cardIdLose = argv[0];
-				uint16 cardIdBookCover = argv[1];
-				uint16 soundIdAddPage = argv[2];
+			// TODO: Fix Logic...
+			// HACK: Bypass Door Lock For Now
+			_vm->changeToCard(cardIdOpen);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kDemoPreviewStack:
+	case kMystStack:
+		if (argc == 3) {
+			uint16 cardIdLose = argv[0];
+			uint16 cardIdBookCover = argv[1];
+			uint16 soundIdAddPage = argv[2];
 
-				debugC(kDebugScript, "Opcode %d: Red and Blue Book/Page Interaction", op);
-				debugC(kDebugScript, "Var: %d", var);
-				debugC(kDebugScript, "Card Id (Lose): %d", cardIdLose);
-				debugC(kDebugScript, "Card Id (Book Cover): %d", cardIdBookCover);
-				debugC(kDebugScript, "SoundId (Add Page): %d", soundIdAddPage);
+			debugC(kDebugScript, "Opcode %d: Red and Blue Book/Page Interaction", op);
+			debugC(kDebugScript, "Var: %d", var);
+			debugC(kDebugScript, "Card Id (Lose): %d", cardIdLose);
+			debugC(kDebugScript, "Card Id (Book Cover): %d", cardIdBookCover);
+			debugC(kDebugScript, "SoundId (Add Page): %d", soundIdAddPage);
 
-				// TODO: if holding page for this book, play SoundIdAddPage
-				if (false) { // TODO: Should be access to mainCursor...
-					_vm->_sound->playSound(soundIdAddPage);
-					// TODO: Code for updating variables based on adding page
-				}
+			// TODO: if holding page for this book, play SoundIdAddPage
+			if (false) { // TODO: Should be access to mainCursor...
+				_vm->_sound->playSound(soundIdAddPage);
+				// TODO: Code for updating variables based on adding page
+			}
 
-				// TODO: Add Tweak to improve original logic by denying
-				//       lose until all red / blue pages collected, rather
-				//       than allowing shortcut based on 1 fireplace page?
+			// TODO: Add Tweak to improve original logic by denying
+			//       lose until all red / blue pages collected, rather
+			//       than allowing shortcut based on 1 fireplace page?
 
-				// If holding last page for this book i.e. var 24/25
-				// Then trigger Trapped in Book Losing Ending
-				if ((var == 100 && !_vm->_varStore->getVar(25)) ||
-				   (var == 101 && !_vm->_varStore->getVar(24))) {
-					// TODO: Clear mainCursor back to nominal..
-					_vm->changeToCard(cardIdLose);
-				} else
-					_vm->changeToCard(cardIdBookCover);
+			// If holding last page for this book i.e. var 24/25
+			// Then trigger Trapped in Book Losing Ending
+			if ((var == 100 && !_vm->_varStore->getVar(25)) ||
+			   (var == 101 && !_vm->_varStore->getVar(24))) {
+				// TODO: Clear mainCursor back to nominal..
+				_vm->changeToCard(cardIdLose);
+			} else
+				_vm->changeToCard(cardIdBookCover);
 	
-				// TODO: Is this logic here?
-				//       i.e. If was holding page, wait then auto open and play book...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-			varUnusedCheck(op, var);
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Is this logic here?
+			//       i.e. If was holding page, wait then auto open and play book...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		varUnusedCheck(op, var);
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2152,181 +2152,181 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 1) {
-				// Used on Card 2111 (Compass Rose)
-				// Called when Button Clicked.
-				uint16 correctButton = argv[0];
+		if (argc == 1) {
+			// Used on Card 2111 (Compass Rose)
+			// Called when Button Clicked.
+			uint16 correctButton = argv[0];
 
-				if (correctButton) {
-					// Correct Button -> Light On Logic
-					// TODO: Deal with if main power on?
-					_vm->_varStore->setVar(16, 1);
-					_vm->_varStore->setVar(30, 0);
-				} else {
-					// Wrong Button -> Power Failure Logic
-					// TODO: Fill in Alarm
-					_vm->_varStore->setVar(16, 0);
-					_vm->_varStore->setVar(30, 2);
-					_vm->_varStore->setVar(33, 0);
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			if (argc == 1) {
-				// Used on Card 4006 (Clock Tower Time Controls)
-				uint16 soundId = argv[0];
+			if (correctButton) {
+				// Correct Button -> Light On Logic
+				// TODO: Deal with if main power on?
+				_vm->_varStore->setVar(16, 1);
+				_vm->_varStore->setVar(30, 0);
+			} else {
+				// Wrong Button -> Power Failure Logic
+				// TODO: Fill in Alarm
+				_vm->_varStore->setVar(16, 0);
+				_vm->_varStore->setVar(30, 2);
+				_vm->_varStore->setVar(33, 0);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		if (argc == 1) {
+			// Used on Card 4006 (Clock Tower Time Controls)
+			uint16 soundId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Clock Tower Bridge Puzzle Execute Button", op);
+			debugC(kDebugScript, "Opcode %d: Clock Tower Bridge Puzzle Execute Button", op);
 
-				uint16 bridgeState = _vm->_varStore->getVar(12);
-				uint16 currentTime = _vm->_varStore->getVar(43);
+			uint16 bridgeState = _vm->_varStore->getVar(12);
+			uint16 currentTime = _vm->_varStore->getVar(43);
 
-				const uint16 correctTime = 32; // 2:40 i.e. From 12 Noon in 5 min increments
+			const uint16 correctTime = 32; // 2:40 i.e. From 12 Noon in 5 min increments
 
-				if (!bridgeState && currentTime == correctTime) {
-					_vm->_sound->playSound(soundId);
+			if (!bridgeState && currentTime == correctTime) {
+				_vm->_sound->playSound(soundId);
 
-					// TODO: Play only 1st half of movie i.e. gears rise up
-					_vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 36);
+				// TODO: Play only 1st half of movie i.e. gears rise up
+				_vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 36);
 					
-					bridgeState = 1;
-					_vm->_varStore->setVar(12, bridgeState);
-				} else if (bridgeState && currentTime != correctTime) {
-					_vm->_sound->playSound(soundId);
+				bridgeState = 1;
+				_vm->_varStore->setVar(12, bridgeState);
+			} else if (bridgeState && currentTime != correctTime) {
+				_vm->_sound->playSound(soundId);
 
-					// TODO: Play only 2nd half of movie i.e. gears sink down
-					_vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 36);
+				// TODO: Play only 2nd half of movie i.e. gears sink down
+				_vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 36);
 
-					bridgeState = 0;
-					_vm->_varStore->setVar(12, bridgeState);
-				}
-            } else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+				bridgeState = 0;
+				_vm->_varStore->setVar(12, bridgeState);
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_117(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			varUnusedCheck(op, var);
+	case kStoneshipStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				// Used on Card 2132 (Chest at Bottom of Lighthouse)
-				// Called when Valve Hotspot Clicked.
-				// TODO: Fill in Function to play right section of movie
-				//       based on valve state and water in chest..
-				_vm->_video->playMovie(_vm->wrapMovieFilename("ligspig", kStoneshipStack), 97, 267);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			if (argc == 2) {
-				// Used by Myst Imager Control Button
-				uint16 varValue = _vm->_varStore->getVar(var);
+		if (argc == 0) {
+			// Used on Card 2132 (Chest at Bottom of Lighthouse)
+			// Called when Valve Hotspot Clicked.
+			// TODO: Fill in Function to play right section of movie
+			//       based on valve state and water in chest..
+			_vm->_video->playMovie(_vm->wrapMovieFilename("ligspig", kStoneshipStack), 97, 267);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		if (argc == 2) {
+			// Used by Myst Imager Control Button
+			uint16 varValue = _vm->_varStore->getVar(var);
 
-				if (varValue)
-					_vm->_sound->playSound(argv[1]);
-				else
-					_vm->_sound->playSound(argv[0]);
+			if (varValue)
+				_vm->_sound->playSound(argv[1]);
+			else
+				_vm->_sound->playSound(argv[0]);
 
-				_vm->_varStore->setVar(var, !varValue);
-				// TODO: Change Var 45 "Dock Forechamber Imager Water Effect Enabled" here?
-            } else
-				unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			varUnusedCheck(op, var);
+			_vm->_varStore->setVar(var, !varValue);
+			// TODO: Change Var 45 "Dock Forechamber Imager Water Effect Enabled" here?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 1) {
-				// Used on Card 3012 (Temple Hologram Monitor)
-				uint16 button = argv[0]; // 0 to 3
-				_vm->_varStore->setVar(17, button);
-				switch (button) {
-					case 0:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("monalgh", kChannelwoodStack), 227, 71);
-						break;
-					case 1:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("monamth", kChannelwoodStack), 227, 71);
-						break;
-					case 2:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("monasirs", kChannelwoodStack), 227, 71);
-						break;
-					case 3:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("monsmsg", kChannelwoodStack), 227, 71);
-						break;
-					default:
-						warning("Opcode %d Control Variable Out of Range", op);
-						break;
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+		if (argc == 1) {
+			// Used on Card 3012 (Temple Hologram Monitor)
+			uint16 button = argv[0]; // 0 to 3
+			_vm->_varStore->setVar(17, button);
+			switch (button) {
+			case 0:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("monalgh", kChannelwoodStack), 227, 71);
+				break;
+			case 1:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("monamth", kChannelwoodStack), 227, 71);
+				break;
+			case 2:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("monasirs", kChannelwoodStack), 227, 71);
+				break;
+			case 3:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("monsmsg", kChannelwoodStack), 227, 71);
+				break;
+			default:
+				warning("Opcode %d Control Variable Out of Range", op);
+				break;
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_118(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			if (argc == 0) {
-				// Used on Card 2126 (Lighthouse Looking Along Plank)
-				// Called when Exit Resource is clicked
+	case kStoneshipStack:
+		if (argc == 0) {
+			// Used on Card 2126 (Lighthouse Looking Along Plank)
+			// Called when Exit Resource is clicked
 
-				// TODO: Implement Function...
-				// If holding Key to Lamp Room Trapdoor, drop to bottom of
-				// Lighthouse...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			varUnusedCheck(op, var);
+			// TODO: Implement Function...
+			// If holding Key to Lamp Room Trapdoor, drop to bottom of
+			// Lighthouse...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 5) {
-				// Used by Card 4709 (Myst Imager Control Panel Red Button)
+		if (argc == 5) {
+			// Used by Card 4709 (Myst Imager Control Panel Red Button)
 
-				debugC(kDebugScript, "Opcode %d: Imager Change Value", op);
+			debugC(kDebugScript, "Opcode %d: Imager Change Value", op);
 
-				uint16 soundIdBeepLo = argv[0];
-				uint16 soundIdBeepHi = argv[1];
-				uint16 soundIdBwapp = argv[2];
-				uint16 soundIdBeepTune = argv[3]; // 5 tones..
-				uint16 soundIdPanelSlam = argv[4];
+			uint16 soundIdBeepLo = argv[0];
+			uint16 soundIdBeepHi = argv[1];
+			uint16 soundIdBwapp = argv[2];
+			uint16 soundIdBeepTune = argv[3]; // 5 tones..
+			uint16 soundIdPanelSlam = argv[4];
 
-				debugC(kDebugScript, "\tsoundIdBeepLo: %d", soundIdBeepLo);
-				debugC(kDebugScript, "\tsoundIdBeepHi: %d", soundIdBeepHi);
-				debugC(kDebugScript, "\tsoundIdBwapp: %d", soundIdBwapp);
-				debugC(kDebugScript, "\tsoundIdBeepTune: %d", soundIdBeepTune);
-				debugC(kDebugScript, "\tsoundIdPanelSlam: %d", soundIdPanelSlam);
+			debugC(kDebugScript, "\tsoundIdBeepLo: %d", soundIdBeepLo);
+			debugC(kDebugScript, "\tsoundIdBeepHi: %d", soundIdBeepHi);
+			debugC(kDebugScript, "\tsoundIdBwapp: %d", soundIdBwapp);
+			debugC(kDebugScript, "\tsoundIdBeepTune: %d", soundIdBeepTune);
+			debugC(kDebugScript, "\tsoundIdPanelSlam: %d", soundIdPanelSlam);
 
-				_vm->_sound->playSound(soundIdBeepLo);
+			_vm->_sound->playSound(soundIdBeepLo);
 
-				// TODO: Complete Logic...
-            } else
-				unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			varUnusedCheck(op, var);
+			// TODO: Complete Logic...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 0) {
-				// Used on Card 3318 (Sirrus' Room Nightstand Drawer)
-				// Triggered when clicked on drawer
-				// TODO: Implement function...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+		if (argc == 0) {
+			// Used on Card 3318 (Sirrus' Room Nightstand Drawer)
+			// Triggered when clicked on drawer
+			// TODO: Implement function...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2334,57 +2334,57 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			if (argc == 0) {
-				// Used on Card 2143 (Lighthouse Trapdoor)
-				// Called when Lock Hotspot Clicked while holding key.
-				_vm->_video->playMovie(_vm->wrapMovieFilename("openloc", kStoneshipStack), 187, 72);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			if (argc == 1) {
-				// Used on Card 4383 and 4451 (Tower Elevator)
-				switch (argv[0]) {
-					case 0:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("libdown", kMystStack), 216, 78);
-						break;
-					case 1:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("libup", kMystStack), 214, 75);
-						break;
-					default:
-						break;
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kChannelwoodStack:
-			if (argc == 0) {
-				// Used on Card 3333 (Temple Hologram)
-				// TODO: Not 100% sure about movie position...
-				switch (_vm->_varStore->getVar(17)) {
-					case 0:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("holoalgh", kChannelwoodStack), 126, 74);
-						break;
-					case 1:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("holoamth", kChannelwoodStack), 126, 74);
-						break;
-					case 2:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("holoasir", kChannelwoodStack), 126, 74);
-						break;
-					case 3:
-						_vm->_video->playMovie(_vm->wrapMovieFilename("holosmsg", kChannelwoodStack), 126, 74);
-						break;
-					default:
-						warning("Opcode %d Control Variable Out of Range", op);
-						break;
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+	case kStoneshipStack:
+		if (argc == 0) {
+			// Used on Card 2143 (Lighthouse Trapdoor)
+			// Called when Lock Hotspot Clicked while holding key.
+			_vm->_video->playMovie(_vm->wrapMovieFilename("openloc", kStoneshipStack), 187, 72);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		if (argc == 1) {
+			// Used on Card 4383 and 4451 (Tower Elevator)
+			switch (argv[0]) {
+			case 0:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("libdown", kMystStack), 216, 78);
+				break;
+			case 1:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("libup", kMystStack), 214, 75);
+				break;
+			default:
+				break;
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kChannelwoodStack:
+		if (argc == 0) {
+			// Used on Card 3333 (Temple Hologram)
+			// TODO: Not 100% sure about movie position...
+			switch (_vm->_varStore->getVar(17)) {
+			case 0:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("holoalgh", kChannelwoodStack), 126, 74);
+				break;
+			case 1:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("holoamth", kChannelwoodStack), 126, 74);
+				break;
+			case 2:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("holoasir", kChannelwoodStack), 126, 74);
+				break;
+			case 3:
+				_vm->_video->playMovie(_vm->wrapMovieFilename("holosmsg", kChannelwoodStack), 126, 74);
+				break;
+			default:
+				warning("Opcode %d Control Variable Out of Range", op);
+				break;
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2394,96 +2394,96 @@
 	MystResource *_top;
 
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			if (argc == 1) {
-				// Used for Cards 2285, 2289, 2247, 2251 (Side Doors in Tunnels Down To Brothers Rooms)
-				uint16 movieId = argv[0];
+	case kStoneshipStack:
+		if (argc == 1) {
+			// Used for Cards 2285, 2289, 2247, 2251 (Side Doors in Tunnels Down To Brothers Rooms)
+			uint16 movieId = argv[0];
 
-				debugC(kDebugScript, "Opcode %d: Play Side Door Movies", op);
-				debugC(kDebugScript, "\tmovieId: %d", movieId);
+			debugC(kDebugScript, "Opcode %d: Play Side Door Movies", op);
+			debugC(kDebugScript, "\tmovieId: %d", movieId);
 
-				switch (movieId) {
-					case 0:
-						// Card 2251
-						_vm->_video->playMovie(_vm->wrapMovieFilename("tunaup", kStoneshipStack), 149, 161);
-						break;
-					case 1:
-						// Card 2247
-						_vm->_video->playMovie(_vm->wrapMovieFilename("tunadown", kStoneshipStack), 218, 150);
-						break;
-					case 2:
-						// Card 2289
-						_vm->_video->playMovie(_vm->wrapMovieFilename("tuncup", kStoneshipStack), 259, 161);
-						break;
-					case 3:
-						// Card 2285
-						_vm->_video->playMovie(_vm->wrapMovieFilename("tuncdown", kStoneshipStack), 166, 150);
-						break;
-					default:
-						warning("Opcode 120 MovieId Out Of Range");
-						break;
-				}
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMystStack:
-			// Used for Card 4297 (Generator Puzzle Buttons)
-			debugC(kDebugScript, "Opcode %d: Toggle Var8 of Invoking Resource", op);
-			_top = _invokingResource;
+			switch (movieId) {
+			case 0:
+				// Card 2251
+				_vm->_video->playMovie(_vm->wrapMovieFilename("tunaup", kStoneshipStack), 149, 161);
+				break;
+			case 1:
+				// Card 2247
+				_vm->_video->playMovie(_vm->wrapMovieFilename("tunadown", kStoneshipStack), 218, 150);
+				break;
+			case 2:
+				// Card 2289
+				_vm->_video->playMovie(_vm->wrapMovieFilename("tuncup", kStoneshipStack), 259, 161);
+				break;
+			case 3:
+				// Card 2285
+				_vm->_video->playMovie(_vm->wrapMovieFilename("tuncdown", kStoneshipStack), 166, 150);
+				break;
+			default:
+				warning("Opcode 120 MovieId Out Of Range");
+				break;
+			}
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMystStack:
+		// Used for Card 4297 (Generator Puzzle Buttons)
+		debugC(kDebugScript, "Opcode %d: Toggle Var8 of Invoking Resource", op);
+		_top = _invokingResource;
 			
-			while(_top->_parent != NULL)
-				_top = _top->_parent;
+		while(_top->_parent != NULL)
+			_top = _top->_parent;
 
-			if (argc == 0) {
-				uint16 var8 = _top->getType8Var();
-				if (var8 != 0xFFFF)
-					_vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8));
-				else
-					warning("Opcode 120: No invoking Resource Var 8 found!");
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
+		if (argc == 0) {
+			uint16 var8 = _top->getType8Var();
+			if (var8 != 0xFFFF)
+				_vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8));
+			else
+				warning("Opcode 120: No invoking Resource Var 8 found!");
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_121(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kMystStack:
-			// Used on Card 4100 (Cabin Safe Buttons)
-			// Correct Solution (724) -> Var 67=2, 68=7, 69=5 
-			// Jump to Card 4103 when solution correct and handle pulled...
-			if (argc == 0) {
-				uint16 varValue = _vm->_varStore->getVar(var);
-				if (varValue == 0)
-					varValue = 9;
-				else
-					varValue--;
-				_vm->_varStore->setVar(var, varValue);
-            } else
-				unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			varUnusedCheck(op, var);
+	case kMystStack:
+		// Used on Card 4100 (Cabin Safe Buttons)
+		// Correct Solution (724) -> Var 67=2, 68=7, 69=5 
+		// Jump to Card 4103 when solution correct and handle pulled...
+		if (argc == 0) {
+			uint16 varValue = _vm->_varStore->getVar(var);
+			if (varValue == 0)
+				varValue = 9;
+			else
+				varValue--;
+			_vm->_varStore->setVar(var, varValue);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		varUnusedCheck(op, var);
 
-			if (argc == 2) {
-				uint16 startTime = argv[0];
-				uint16 endTime = argv[1];
+		if (argc == 2) {
+			uint16 startTime = argv[0];
+			uint16 endTime = argv[1];
 
-				printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, startTime, endTime);
-				// TODO: Need version of playMovie blocking which allows selection
-				//       of start and finish points.
-				_vm->_video->playMovie(_vm->wrapMovieFilename("ewindow", kMechanicalStack), 253, 0);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-			varUnusedCheck(op, var);
+			printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, startTime, endTime);
+			// TODO: Need version of playMovie blocking which allows selection
+			//       of start and finish points.
+			_vm->_video->playMovie(_vm->wrapMovieFilename("ewindow", kMechanicalStack), 253, 0);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		varUnusedCheck(op, var);
 
-            unknown(op, var, argc, argv);
-			break;
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2491,36 +2491,36 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kChannelwoodStack:
-			// Used on Channelwood Card 3280
-			if (argc == 0) {
-				debugC(kDebugScript, "Opcode %d: Do Water Tank Valve Close Animation", op);
-				Common::Rect rect = _invokingResource->getRect();
+	case kChannelwoodStack:
+		// Used on Channelwood Card 3280
+		if (argc == 0) {
+			debugC(kDebugScript, "Opcode %d: Do Water Tank Valve Close Animation", op);
+			Common::Rect rect = _invokingResource->getRect();
 
-				// TODO: Need to load the image ids from Script Resources structure of VIEW
-				for (uint16 imageId = 3601; imageId >= 3595; imageId--) {
-					_vm->_gfx->copyImageToScreen(imageId, rect);
-					_vm->_system->delayMillis(50);
-				}
+			// TODO: Need to load the image ids from Script Resources structure of VIEW
+			for (uint16 imageId = 3601; imageId >= 3595; imageId--) {
+				_vm->_gfx->copyImageToScreen(imageId, rect);
+				_vm->_system->delayMillis(50);
+			}
 
-				// TODO: Is 8 gotten from var7 of calling hotspot, rather than hard-coded?
-				_vm->_varStore->setVar(8, 0);
-				_vm->_varStore->setVar(19, 0);
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used on Card 6120 (Elevator)
-				// Called when Exit Midde Button Pressed
+			// TODO: Is 8 gotten from var7 of calling hotspot, rather than hard-coded?
+			_vm->_varStore->setVar(8, 0);
+			_vm->_varStore->setVar(19, 0);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used on Card 6120 (Elevator)
+			// Called when Exit Midde Button Pressed
 
-				// TODO: hcelev? Movie of Elevator?
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: hcelev? Movie of Elevator?
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2528,23 +2528,23 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 2) {
-				// Used on Card 6154
-				uint16 start_time = argv[0];
-				uint16 end_time = argv[1];
+	case kMechanicalStack:
+		if (argc == 2) {
+			// Used on Card 6154
+			uint16 start_time = argv[0];
+			uint16 end_time = argv[1];
 
-				printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, start_time, end_time);
-				// TODO: Need version of playMovie blocking which allows selection
-				//       of start and finish points.
-				// TODO: Not 100% sure about movie position
-				_vm->_video->playMovie(_vm->wrapMovieFilename("hcelev", kMechanicalStack), 205, 40);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			printf("TODO: Opcode %d Movie Time Index %d to %d\n", op, start_time, end_time);
+			// TODO: Need version of playMovie blocking which allows selection
+			//       of start and finish points.
+			// TODO: Not 100% sure about movie position
+			_vm->_video->playMovie(_vm->wrapMovieFilename("hcelev", kMechanicalStack), 205, 40);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2552,48 +2552,48 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used by Card 6156 (Fortress Rotation Controls)
-				// Called when Red Exit Button Pressed to raise Elevator
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used by Card 6156 (Fortress Rotation Controls)
+			// Called when Red Exit Button Pressed to raise Elevator
 
-				// TODO: Fill in Code...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Code...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
 void MystScriptParser::opcode_125(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	switch (_vm->getCurStack()) {
-		case kStoneshipStack:
-			if (argc == 1) {
-				// Used on Card 2197 (Sirrus' Room Drawers)
-				debugC(kDebugScript, "Opcode %d: Unknown uses Var %d", op, var);
+	case kStoneshipStack:
+		if (argc == 1) {
+			// Used on Card 2197 (Sirrus' Room Drawers)
+			debugC(kDebugScript, "Opcode %d: Unknown uses Var %d", op, var);
 
-				uint16 u0 = argv[0];
+			uint16 u0 = argv[0];
 
-				debugC(kDebugScript, "\tu0: %d", u0);
-				// TODO: Fill in Logic...
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used on Card 6267 (Code Lock)
-				// Called by Red Execute Button...
-				debugC(kDebugScript, "Opcode %d: Code Lock Execute...", op);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			// TODO: Fill in Logic...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used on Card 6267 (Code Lock)
+			// Called by Red Execute Button...
+			debugC(kDebugScript, "Opcode %d: Code Lock Execute...", op);
 
-				// TODO: Fill in Logic For Code Lock...
-			} else
-            	unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Logic For Code Lock...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2601,19 +2601,19 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used by Card 6120 (Fortress Elevator)
-				// Called when Red Exit Button Pressed to raise Elevator and
-				// exit is clicked...
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used by Card 6120 (Fortress Elevator)
+			// Called when Red Exit Button Pressed to raise Elevator and
+			// exit is clicked...
 
-				// TODO: Fill in Code...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Code...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2621,31 +2621,31 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kChannelwoodStack:
-			if (argc == 2) {
-				// Used by Card 3262 (Elevator)
-				debugC(kDebugScript, "Opcode %d: Unknown...", op);
+	case kChannelwoodStack:
+		if (argc == 2) {
+			// Used by Card 3262 (Elevator)
+			debugC(kDebugScript, "Opcode %d: Unknown...", op);
 
-				uint16 u0 = argv[0];
-				uint16 u1 = argv[1];
+			uint16 u0 = argv[0];
+			uint16 u1 = argv[1];
 
-				debugC(kDebugScript, "\tu0: %d", u0);
-				debugC(kDebugScript, "\tu1: %d", u1);
+			debugC(kDebugScript, "\tu0: %d", u0);
+			debugC(kDebugScript, "\tu1: %d", u1);
 
-				// TODO: Fill in Code...
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(20, 1);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Code...
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(20, 1);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2653,16 +2653,16 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(20, 0);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		default:
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(20, 0);
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2670,30 +2670,30 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kChannelwoodStack:
-			if (argc == 1) {
-				// Used by Card 3262 (Elevator)
-				debugC(kDebugScript, "Opcode %d: Unknown...", op);
+	case kChannelwoodStack:
+		if (argc == 1) {
+			// Used by Card 3262 (Elevator)
+			debugC(kDebugScript, "Opcode %d: Unknown...", op);
 
-				uint16 cardId = argv[0];
+			uint16 cardId = argv[0];
 
-				debugC(kDebugScript, "\tcardId: %d", cardId);
+			debugC(kDebugScript, "\tcardId: %d", cardId);
 
-				// TODO: Fill in Code...
-				_vm->changeToCard(cardId);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(21, 1);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-        default:
-            unknown(op, var, argc, argv);
-			break;
+			// TODO: Fill in Code...
+			_vm->changeToCard(cardId);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(21, 1);
+		} else
+			unknown(op, var, argc, argv);
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2701,16 +2701,16 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(21, 0);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		default:
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(21, 0);
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2718,16 +2718,16 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(22, 1);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		default:
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(22, 1);
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2735,16 +2735,16 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMechanicalStack:
-			if (argc == 0) {
-				// Used for Mech Card 6226 (3 Crystals)
-				_vm->_varStore->setVar(22, 0);
-			} else
-				unknown(op, var, argc, argv);
-			break;
-		default:
+	case kMechanicalStack:
+		if (argc == 0) {
+			// Used for Mech Card 6226 (3 Crystals)
+			_vm->_varStore->setVar(22, 0);
+		} else
 			unknown(op, var, argc, argv);
-			break;
+		break;
+	default:
+		unknown(op, var, argc, argv);
+		break;
 	}
 }
 
@@ -2752,23 +2752,23 @@
 	varUnusedCheck(op, var);
 
 	switch (_vm->getCurStack()) {
-		case kMystStack:
-			// Used on Card 4500 (Stellar Observatory Controls)
-			if (argc == 1) {
-				// Called by Telescope Slew Button
-				uint16 soundId = argv[0];
+	case kMystStack:
+		// Used on Card 4500 (Stellar Observatory Controls)

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list