ACCESS: Janitorial

23 files changed, 165 insertions, 166 deletions

diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 41706fc4fd..2153f594b1 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -396,7 +396,7 @@ void AccessEngine::copyBF1BF2() {
 
 void AccessEngine::copyBF2Vid() {
 	const byte *srcP = (const byte *)_buffer2.getPixels();
-	byte *destP = (byte *)_screen->getBasePtr(_screen->_windowXAdd, 
+	byte *destP = (byte *)_screen->getBasePtr(_screen->_windowXAdd,
 		_screen->_windowYAdd + _screen->_screenYOff);
 
 	for (int yp = 0; yp < _screen->_vWindowLinesTall; ++yp) {
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 248f5e2f49..deb45ff4b1 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -32,12 +32,12 @@ namespace Amazon {
 
 AmazonEngine::AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc) :
 AccessEngine(syst, gameDesc),
-		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]), 
+		_guardLocation(_flags[122]), _guardFind(_flags[128]), _helpLevel(_flags[167]),
 		_jasMayaFlag(_flags[168]), _moreHelp(_flags[169]), _flashbackFlag(_flags[171]),
-		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]), 
-		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]), 
+		_riverFlag(_flags[185]), _aniOutFlag(_flags[195]), _badEnd(_flags[218]),
+		_noHints(_flags[219]), _aniFlag(_flags[229]), _allenFlag(_flags[237]),
 		_noSound(_flags[239]),
-		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this), 
+		_ant(this), _cast(this), _guard(this), _jungle(this), _opening(this),
 		_plane(this), _river(this) {
 
 	_charSegSwitch = false;
@@ -263,7 +263,7 @@ void AmazonEngine::tileScreen() {
 	int x = res->_stream->readSint16LE();
 	int y = res->_stream->readSint16LE();
 	int size = ((x + 2) * y) + 10;
-	
+
 	for (int i = 0; i < size; ++i)
 		_tileData[i] = res->_stream->readByte();
 
@@ -292,7 +292,7 @@ void AmazonEngine::updateSummary(int chap) {
 	_updateChapter = chapter;
 	Common::Array<CellIdent> summaryCells;
 	loadCells(summaryCells);
-	
+
 	for (int i = celSubFile; i < 16; ++i) {
 		if (i > 7)
 			warning("TODO: DRAWOBJECT");
@@ -374,7 +374,7 @@ void AmazonEngine::helpTitle() {
 		index = 169;
 
 	index /= 20;
-	
+
 	iqText += " ";
 	iqText += IQLABELS[index];
 
@@ -439,7 +439,7 @@ void AmazonEngine::drawHelp(const Common::String str) {
 		_screen->_clipHeight = 200;
 		_screen->plotImage(_objectsTable[95], 0, Common::Point(76, 168));
 		_destIn = oldDest;
-		_screen->_clipHeight = oldClip;		
+		_screen->_clipHeight = oldClip;
 	}
 
 	if ((_useItem == 0) && (_screen->_vesaMode == 0))
@@ -456,7 +456,7 @@ void AmazonEngine::startChapter(int chapter) {
 	if (chapter != 1) {
 		_room->clearRoom();
 		freeChar();
-		
+
 		_midi->newMusic(32, 0);
 		playVideo(0, Common::Point());
 		if (shouldQuit())
@@ -495,7 +495,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->clearScreen();
 
 	_screen->setPanel(3);
-	
+
 	// Set up cells for the chapter display
 	Common::Array<CellIdent> chapterCells;
 	chapterCells.push_back(CellIdent(0, 96, 17));
@@ -508,7 +508,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_buffer2.copyFrom(*_screen);
 
 	const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0];
-	_screen->plotImage(_objectsTable[0], _chapter - 1, 
+	_screen->plotImage(_objectsTable[0], _chapter - 1,
 		Common::Point(chapImg[1], chapImg[2]));
 	_screen->plotImage(_objectsTable[_chapter], 0,
 		Common::Point(chapImg[3], chapImg[4]));
@@ -535,7 +535,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->forceFadeOut();
 	_events->debounceLeft();
 	_events->zeroKeys();
-	
+
 	_screen->clearBuffer();
 	_files->loadScreen(96, 16);
 	_buffer2.copyFrom(*_screen);
@@ -573,7 +573,7 @@ void AmazonEngine::startChapter(int chapter) {
 	_screen->forceFadeOut();
 	_screen->clearBuffer();
 	freeCells();
-	
+
 	_midi->newMusic(_chapter * 2, 1);
 
 	if (chapter != 1 && chapter != 14) {
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 9ccf5eb62c..428b85f969 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -245,19 +245,19 @@ void Opening::doCredit() {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 23, Common::Point(77, 20));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(50, 35));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(96, 45));
 	} else if (_pCount <= 334) {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 16, Common::Point(200, 70));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(170, 85));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 3, Common::Point(68, 54));
 	} else if (_pCount <= 396) {
 		if (_vm->isDemo()) {
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 15, Common::Point(65, 15));
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 2, Common::Point(30, 30));
-		} else 
+		} else
 			_vm->_buffer2.plotImage(_vm->_objectsTable[0], 4, Common::Point(103, 54));
 	} else if (_pCount <= 458) {
 		if (_vm->isDemo()) {
@@ -320,7 +320,7 @@ void Opening::doTitle() {
 
 		_vm->_files->_setPaletteFlag = false;
 		_vm->_files->loadScreen(0, 3);
-		
+
 		_vm->_buffer2.copyFrom(*_vm->_screen);
 		_vm->_buffer1.copyFrom(*_vm->_screen);
 		_vm->_screen->forceFadeIn();
@@ -523,7 +523,7 @@ void Opening::doTent() {
 		}
 
 		_vm->_events->pollEventsAndWait();
-	}	
+	}
 
 	_vm->_sound->playSound(5);
 	_vm->_video->setVideo(_vm->_screen, Common::Point(43, 11), FileIdent(2, 2), 10);
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 1b83e6bf70..bd4e4f838d 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -68,10 +68,10 @@ const char *const FILENAMES_DEMO[] = {
 	"C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP",
 	"C24.AP", "C25.AP", "R49.AP", "R49.AP", "R49.AP", "R49.AP",
 	"R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP",
-	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP" 
+	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP"
 };
 const byte MOUSE0[] = {
-	0, 0, 0, 0, 
+	0, 0, 0, 0,
 	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
 	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
 	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
@@ -971,7 +971,7 @@ const byte *ROOM_TABLE_DEMO[] = {
 	ROOM_TABLE26_DEMO, ROOM_TABLE27_DEMO, ROOM_TABLE28_DEMO, nullptr, ROOM_TABLE30_DEMO,
 	ROOM_TABLE31_DEMO, ROOM_TABLE32_DEMO, ROOM_TABLE33_DEMO, ROOM_TABLE34_DEMO, nullptr,
 	nullptr, ROOM_TABLE37_DEMO, ROOM_TABLE38_DEMO, ROOM_TABLE39_DEMO, ROOM_TABLE40_DEMO,
-	nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO, 
+	nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO,
 	ROOM_TABLE46_DEMO, ROOM_TABLE47_DEMO, ROOM_TABLE48_DEMO, nullptr, nullptr,
 	ROOM_TABLE51_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE55_DEMO,
 	nullptr, nullptr, ROOM_TABLE58_DEMO, nullptr, nullptr,
@@ -1124,14 +1124,14 @@ const byte BEXPLODE[] = {
 
 const byte THORNICK[] = {
 	0x2, 0x7, 0x0, 0x7, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x0,
-	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0, 
-	0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3, 
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0,
+	0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3,
 	0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x4, 0x0, 0x7, 0x0, 0x8, 0x0, 0xFF, 0xFF
 };
 
 const byte MAYA[] = {
-	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
-	0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 
+	0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0,
 	0x48, 0x0, 0x0, 0x0, 0x48, 0x0, 0x2, 0x0, 0x48, 0x0, 0x13, 0x0, 0x48,
 	0x0, 0x3, 0x0, 0x48, 0x0, 0x14, 0x0, 0x48, 0x0, 0x4, 0x0, 0x48, 0x0, 0x15,
 	0x0, 0x48, 0x0, 0x5, 0x0, 0x48, 0x0, 0x16, 0x0, 0x48, 0x0, 0x6, 0x0, 0x48,
@@ -1258,14 +1258,14 @@ const byte JWATER[] = {
 const byte SHOOT[] = {
 	0x2, 0xFF, 0xFF, 0x52, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x0, 0x0, 0x0, 0x0, 0x38, 0x52, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0,
-	0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52, 
+	0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52,
 	0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF
 };
 
 const byte ADIE[] = {
 	0x2, 0xFF, 0xFF, 0x53, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x53, 0x0, 0x0, 0x0, 0x53,
-	0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4, 
+	0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4,
 	0x0, 0x53, 0x0, 0x4, 0x0, 0x62, 0x0, 0x4, 0x0, 0xFF, 0xFF
 };
 
@@ -1278,20 +1278,20 @@ const byte DYNAMITE[] = {
 const byte MAYASHOT[] = {
 	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0xFF, 0x0, 0x0, 0x0, 0x0, 0x36, 0x55, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF,
-	0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 
+	0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F,
 	0x0, 0xFF, 0xFF
 };
 
 const byte OFFKEV[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 
-	0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
+	0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x29, 0x0, 0x0, 0x0, 0x29, 0x0, 0x2, 0x0, 0x29, 0x0, 0x3, 0x0, 0xFF, 0xFF
 };
 
 const byte VALLEY[] = {
 	0x2, 0x3A, 0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0,
 	0x0, 0x0, 0x0, 0x3A, 0x3A, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0x3, 0x0,
-	0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0, 
+	0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0,
 	0x4, 0x0, 0x62, 0x0, 0x27, 0x0, 0xFF, 0xFF
 };
 
@@ -1352,14 +1352,14 @@ const byte ROBOT[] = {
 };
 
 const byte ANTKILL[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
-	0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0,
+	0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59,
 	0x0, 0x0, 0x0, 0x59, 0x0, 0x2, 0x0, 0x62, 0x0, 0x0E, 0x0, 0xFF, 0xFF
 };
 
 const byte LOCOHOT[] = {
-	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 
-	0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A, 
+	0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0,
+	0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A,
 	0x0, 0x0, 0x0, 0x5A, 0x0, 0x2, 0x0, 0x62, 0x0, 0x3C, 0x0, 0xFF, 0xFF
 };
 
@@ -1593,7 +1593,7 @@ const byte FONT6x6_DATA[] = {
 	0x54, 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x56, 0x49,
 };
 
-const char *const NO_HELP_MESSAGE = 
+const char *const NO_HELP_MESSAGE =
 	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \
 HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \
 YOU CAN UNDERSTAND.";
@@ -1707,7 +1707,7 @@ const char *const DEATH_TEXT[58] = {
 	"MAYA FALLS OFF THE END OF THE BROKEN BRIDGE.",
 	"YOUR WEIGHT IS JUST ENOUGH TO CAUSE THE REMAINING SUPPORT CABLE TO SNAP AND YOU "
 		"FALL TO THE BOTTOM OF THE GORGE.",
-	
+
 	"EVEN WITH REPAIRS THE BRIDGE IS NOT STRONG ENOUGH TO HOLD TWO PEOPLE.",
 	"SANCHEZ AND HIS MEN FIND YOU AND HOLD FIRING SQUAD PRACTICE.",
 	"THE TWO GUARDS ARE DISTURBED IN THEIR LOVE NEST AND COME LOOKING FOR ANYONE ACTING SUSPICIOUS.  "
@@ -1886,7 +1886,7 @@ const int ANTEAT[33] = {
 	 9,  0,  -6,
 	 8,  0,  11,
 	 7,  0,   6,
-	-1, -1,  -1 
+	-1, -1,  -1
 };
 
 const int ANTDIE[21] = {
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 24aedf5722..d6ab2bd758 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -54,7 +54,7 @@ void AmazonRoom::reloadRoom() {
 		_vm->_currentMan = _roomFlag;
 		_vm->_currentManOld = _roomFlag;
 		_vm->_manScaleOff = 0;
-		
+
 		switch (_vm->_currentMan) {
 		case 0:
 			_vm->_player->loadSprites("MAN.LZ");
@@ -78,7 +78,7 @@ void AmazonRoom::reloadRoom() {
 }
 
 void AmazonRoom::reloadRoom1() {
-	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
 		_game->_inactive._altSpritesPtr = new SpriteResource(_vm, spriteData);
@@ -183,7 +183,7 @@ void AmazonRoom::mainAreaClick() {
 			default:
 				break;
 			}
-		} 
+		}
 
 		// WORKAROUND: In Amazon room 9, you can't leave the screen to the south due
 		// to not being able to click a Y position that's high enough
@@ -208,7 +208,7 @@ void AmazonRoom::walkCursor() {
 	// the Exit icon wgeb the cursor is already a walk cursor
 	EventsManager &events = *_vm->_events;
 
-	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 && 
+	if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 &&
 			events._normalMouse != CURSOR_CROSSHAIRS)) {
 		events._normalMouse = CURSOR_CROSSHAIRS;
 		events.setCursor(CURSOR_CROSSHAIRS);
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 5cf22106b7..fb1ccbe05e 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -57,7 +57,7 @@ void AmazonScripts::mWhile1() {
 
 	_vm->_screen->setIconPalette();
 	_vm->_screen->forceFadeIn();
-	
+
 	Resource *spriteData = _vm->_files->loadFile(14, 6);
 	_vm->_objectsTable[0] = new SpriteResource(_vm, spriteData);
 	delete spriteData;
@@ -340,7 +340,7 @@ void AmazonScripts::executeSpecial(int commandIndex, int param1, int param2) {
 		else
 			setInactive();
 		break;
-	case 5: 
+	case 5:
 		warning("TODO: DEMO - UNLOADCELLSET");
 		break;
 	case 6:
@@ -450,7 +450,7 @@ void AmazonScripts::cmdHelp() {
 			_vm->_screen->restorePalette();
 			_vm->_screen->setPalette();
 			_vm->_events->showCursor();
-			
+
 			delete _vm->_objectsTable[45];
 			_vm->_objectsTable[45] = nullptr;
 			_vm->_timers.restoreTimers();
@@ -507,8 +507,8 @@ void AmazonScripts::cmdMainPanel() {
 	}
 }
 
-void AmazonScripts::CMDRETFLASH() { 
-	error("TODO CMDRETFLASH"); 
+void AmazonScripts::CMDRETFLASH() {
+	error("TODO CMDRETFLASH");
 }
 
 } // End of namespace Amazon
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index e59874fe7a..b13fcfdc1e 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -87,7 +87,7 @@ typedef void(Animation::*AnimationMethodPtr)();
 
 void Animation::animate() {
 	static const AnimationMethodPtr METHODS[8] =
-	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3, 
+	{ &Animation::anim0, &Animation::anim1, &Animation::anim2, &Animation::anim3,
 	&Animation::anim4, &Animation::animNone, &Animation::animNone, &Animation::anim7 };
 
 	(this->*METHODS[_type])();
@@ -310,10 +310,10 @@ Animation *AnimationManager::setAnimation(int animId) {
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
 
-	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 : 
+	anim->_currentLoopCount = (anim->_type != 3 && anim->_type != 4) ? 0 :
 		anim->_loopCount;
 	anim->_field10 = 0;
-		
+
 	return anim;
 }
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 4202ed098f..cd872e04b2 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -55,11 +55,11 @@ SpriteFrame::SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, i
 	int xSize = stream->readUint16LE();
 	int ySize = stream->readUint16LE();
 	create(xSize, ySize);
-	
+
 	// Empty surface
 	byte *data = (byte *)getPixels();
 	Common::fill(data, data + w * h, 0);
-	
+
 	// Decode the data
 	for (int y = 0; y < h; ++y) {
 		int offset = stream->readByte();
@@ -225,7 +225,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
 	int scaleXCtr = 0, scaleYCtr = 0;
 
 	for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr) {
-		// Handle skipping lines if Y scaling 
+		// Handle skipping lines if Y scaling
 		scaleYCtr += scaleY;
 		if (scaleYCtr < SCALE_LIMIT)
 			continue;
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index ff6c4de53d..e9e2a182c0 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -159,10 +159,10 @@ void BubbleBox::printBubble(const Common::String &msg) {
 		int xp = _vm->_screen->_printOrg.x;
 		if (_type == TYPE_4)
 			xp = (_bounds.width() - width) / 2 + _bounds.left - 4;
-		
+
 		// Draw the text
 		font2.drawString(_vm->_screen, line, Common::Point(xp, _vm->_screen->_printOrg.y));
-		
+
 		// Move print position
 		_vm->_screen->_printOrg.y += 6;
 		_vm->_screen->_printOrg.x = _vm->_screen->_printStart.x;
@@ -237,10 +237,10 @@ void BubbleBox::doBox(int item, int box) {
 	yp += (_type == TYPE_4) ? 4 : 8;
 
 	for (int x = 0; x < xSize; ++x, xp += 20) {
-		screen.plotImage(icons, (_type == TYPE_4 ? 62 : 34) + x, 
+		screen.plotImage(icons, (_type == TYPE_4 ? 62 : 34) + x,
 			Common::Point(xp, yp));
 	}
-	
+
 	yp = screen._orgY2 - (_type == TYPE_4 ? 18 : 12);
 	screen.plotImage(icons, (_type == TYPE_4) ? 73 : 23, Common::Point(xp, yp));
 
@@ -274,7 +274,7 @@ void BubbleBox::doBox(int item, int box) {
 	_charCol = charCol;
 	_rowOff = rowOff;
 	_vm->_screen->restoreScreen();
-	
+
 	// Free icons data
 	delete icons;
 }
diff --git a/engines/access/bubble_box.h b/engines/access/bubble_box.h
index 7b25a58183..128bd618ff 100644
--- a/engines/access/bubble_box.h
+++ b/engines/access/bubble_box.h
@@ -71,7 +71,7 @@ public:
 	void calcBubble(const Common::String &msg);
 
 	/**
-	 * Prints a text bubble and it's contents 
+	 * Prints a text bubble and it's contents
 	 */
 	void printBubble(const Common::String &msg);
 
diff --git a/engines/access/data.h b/engines/access/data.h
index 08fbb40d68..6b44eddd75 100644
--- a/engines/access/data.h
+++ b/engines/access/data.h
@@ -77,7 +77,7 @@ public:
 	void updateTimers();
 
 	/**
-	 * Synchronize savegame data 
+	 * Synchronize savegame data
 	 */
 	void synchronize(Common::Serializer &s);
 };
diff --git a/engines/access/events.h b/engines/access/events.h
index 95ba926384..965e8e7fd6 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -29,9 +29,9 @@
 
 namespace Access {
 
-enum CursorType { 
+enum CursorType {
 	CURSOR_NONE = -1,
-	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK, 
+	CURSOR_ARROW = 0, CURSOR_CROSSHAIRS, CURSOR_2, CURSOR_3, CURSOR_LOOK,
 	CURSOR_USE, CURSOR_TAKE, CURSOR_CLIMB, CURSOR_TALK, CURSOR_HELP,
 	CURSOR_INVENTORY = 99
 };
diff --git a/engines/access/files.cpp b/engines/access/files.cpp
index 9fff6c4102..b846cbd32c 100644
--- a/engines/access/files.cpp
+++ b/engines/access/files.cpp
@@ -187,7 +187,7 @@ void FileManager::handleFile(Resource *res) {
 
 	bool isCompressed = !strncmp(header, "DBE", 3);
 
-	// If the data is compressed, uncompress it and replace the stream 
+	// If the data is compressed, uncompress it and replace the stream
 	// in the resource with the decompressed one
 	if (isCompressed) {
 		// Read in the entire compressed data
@@ -214,7 +214,7 @@ void FileManager::setAppended(Resource *res, int fileNum) {
 	// If a different file has been opened then previously, load its index
 	if (_fileNumber != fileNum) {
 		_fileNumber = fileNum;
-			
+
 		// Read in the file index
 		int count = res->_file.readUint16LE();
 		assert(count <= 100);
diff --git a/engines/access/font.cpp b/engines/access/font.cpp
index 5686cdf3b0..51fb9dc1c8 100644
--- a/engines/access/font.cpp
+++ b/engines/access/font.cpp
@@ -50,7 +50,7 @@ void Font::load(const int *fontIndex, const byte *fontData) {
 			int bitsLeft = 0;
 			byte srcByte = 0;
 			byte pixel;
-			
+
 			byte *pDest = (byte *)_chars[i].getBasePtr(0, y);
 			for (int x = 0; x < _chars[i].w; ++x, ++pDest) {
 				// Get the pixel
@@ -115,8 +115,8 @@ bool Font::getLine(Common::String &s, int maxWidth, Common::String &line, int &w
 			s = "";
 			return true;
 		}
-		
-		// Work backwards to find space at the start of the current word 
+
+		// Work backwards to find space at the start of the current word
 		// as a point to split the line on
 		while (src >= s.c_str() && *src != ' ') {
 			width -= charWidth(*src);
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 1bf3bdc8a0..d9e1b496a4 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -93,16 +93,15 @@ int &InventoryManager::operator[](int idx) {
 	return (idx >= (int)_inv.size()) ? invalid : _inv[idx]._value;
 }
 
-int InventoryManager::useItem() { 
+int InventoryManager::useItem() {
 	return _vm->_useItem;
 }
 
-void InventoryManager::setUseItem(int itemId) { 
-	_vm->_useItem = itemId; 
+void InventoryManager::setUseItem(int itemId) {
+	_vm->_useItem = itemId;
 }
 
 void InventoryManager::refreshInventory() {
-	
 	// The original version was using pre-rendering for the inventory to spare some time.
 	// This is not needed on modern hardware, and it breaks a couple of things.
 	// Therefore it was removed in order to keep the same logic than for the CD version
@@ -120,7 +119,7 @@ int InventoryManager::newDisplayInv() {
 
 	_invModeFlag = true;
 	_vm->_timers.saveTimers();
-	
+
 	if (!room._tile && !_invRefreshFlag) {
 		saveScreens();
 	}
@@ -361,7 +360,7 @@ void InventoryManager::saveScreens() {
 	_vm->_buffer1.copyTo(&_savedBuffer1);
 	_vm->_screen->copyTo(&_savedScreen);
 	_vm->_newRects.push_back(Common::Rect(0, 0, _savedScreen.w, _savedScreen.h));
-	
+
 }
 
 void InventoryManager::restoreScreens() {
@@ -425,7 +424,7 @@ void InventoryManager::combineItems() {
 		Common::Point newPt;
 		newPt.x = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
 		newPt.y = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
-		
+
 		screen.plotImage(sprites, invItem, newPt);
 		lastBox = newPt;
 	}
@@ -435,7 +434,7 @@ void InventoryManager::combineItems() {
 			&& _items[destBox] != -1) {
 		int itemA = invItem;
 		int itemB = _items[destBox];
-		
+
 		// Check whether the items can be combined
 		int combinedItem = _inv[itemA].checkItem(itemB);
 		if (combinedItem != -1) {
@@ -454,7 +453,7 @@ void InventoryManager::combineItems() {
 			Common::Rect destRect(_invCoords[destBox].left, _invCoords[destBox].top,
 				_invCoords[destBox].left + 46, _invCoords[destBox].top + 35);
 			_vm->_buffer2.copyBlock(&_vm->_buffer1, destRect);
-			screen._screenYOff = 0;			
+			screen._screenYOff = 0;
 			zoomIcon(itemB, -1, destBox, true);
 
 			// Exand up the new combined item from nothing to full size
diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp
index ae63f66c7c..046e06c6e3 100644
--- a/engines/access/martian/martian_resources.cpp
+++ b/engines/access/martian/martian_resources.cpp
@@ -32,11 +32,11 @@ const char *const FILENAMES[] = {
 	"R08.AP", "R09.AP", "R10.AP", "R11.AP", "R12.AP", "R13.AP", "R14.AP", "R15.AP",
 	"R16.AP", "R17.AP", "R18.AP", "R19.AP", "R20.AP", "R21.AP", "R22.AP", "R23.AP",
 	"R24.AP", "R25.AP", "R26.AP", "R27.AP", "R28.AP", "R29.AP", "R30.AP", "R31.AP",
-	"R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", 
+	"R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP",
 	"R40.AP","TITLE.AP","R42.AP","S01.AP",  "R44.AP", "R45.AP","SOUND.AP","MUSIC.AP",
 	"DEAD.AP","EST.AP", "W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP",
-	"C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", 
-	"C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", 
+	"C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP",
+	"C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP",
 	"C16A.AP","C09.AP", "R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP"
 };
 
@@ -653,9 +653,9 @@ const byte CHAR_TABLE27[] = {
 const byte *CHAR_TABLE[] = {
 	CHAR_TABLE0, nullptr, CHAR_TABLE2, CHAR_TABLE3, CHAR_TABLE4, CHAR_TABLE5,
 	CHAR_TABLE6, CHAR_TABLE7, CHAR_TABLE8, CHAR_TABLE9, CHAR_TABLE10,
-	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15, 
-	CHAR_TABLE16, nullptr, CHAR_TABLE18, CHAR_TABLE19, CHAR_TABLE20, 
-	CHAR_TABLE21, nullptr, CHAR_TABLE23, CHAR_TABLE24, CHAR_TABLE25, 
+	CHAR_TABLE11, CHAR_TABLE12, CHAR_TABLE13, nullptr, CHAR_TABLE15,
+	CHAR_TABLE16, nullptr, CHAR_TABLE18, CHAR_TABLE19, CHAR_TABLE20,
+	CHAR_TABLE21, nullptr, CHAR_TABLE23, CHAR_TABLE24, CHAR_TABLE25,
 	CHAR_TABLE26, CHAR_TABLE27
 };
 
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index 62c44bc529..2bd98186f0 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -49,7 +49,7 @@ void MartianRoom::reloadRoom() {
 		_vm->_currentMan = _roomFlag;
 		_vm->_currentManOld = _roomFlag;
 		_vm->_manScaleOff = 0;
-		
+
 		switch (_vm->_currentMan) {
 		case 0:
 			_vm->_player->loadSprites("MAN.LZ");
@@ -73,7 +73,7 @@ void MartianRoom::reloadRoom() {
 }
 
 void MartianRoom::reloadRoom1() {
-	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31 
+	if (_vm->_player->_roomNumber == 29 || _vm->_player->_roomNumber == 31
 			|| _vm->_player->_roomNumber == 42 || _vm->_player->_roomNumber == 44) {
 		//Resource *spriteData = _vm->_files->loadFile("MAYA.LZ");
 		//_vm->_inactive._spritesPtr = new SpriteResource(_vm, spriteData);
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 97d7d4845d..5668e9c6b9 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -146,7 +146,7 @@ void Player::removeSprite1() {
 
 void Player::calcManScale() {
 	if (!_vm->_manScaleOff) {
-		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) * 
+		_vm->_scale = ((((_rawPlayer.y - _vm->_scaleMaxY + _vm->_scaleN1) *
 			_vm->_scaleT1 + (_vm->_scaleH2 << 8)) & 0xff00) / _vm->_scaleH1 * _vm->_scaleI) >> 8;
 		_vm->_screen->setScaleTable(_vm->_scale);
 
@@ -159,7 +159,7 @@ void Player::calcManScale() {
 void Player::walk() {
 	_collideFlag = false;
 	_playerDirection = NONE;
-	
+
 	if (_playerOff)
 		return;
 	else if (_vm->_timers[0]._flag) {
@@ -223,7 +223,7 @@ void Player::walkUp() {
 	int walkOff = _walkOffUp[_frame - _upWalkMin];
 	int tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOff];
 	_rawYTempL = (byte)tempL;
-	int yTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff] - 
+	int yTemp = _rawPlayer.y - _vm->_screen->_scaleTable1[walkOff] -
 		(tempL < 0 ? 1 : 0);
 	_rawYTemp = yTemp;
 	_rawXTemp = _rawPlayer.x;
@@ -233,7 +233,7 @@ void Player::walkUp() {
 	} else {
 		_rawPlayer.y = _rawYTemp;
 		_rawPlayerLow.y = _rawYTempL;
-		
+
 		calcManScale();
 
 		// This code looks totally useless as 'si' is unconditionally set in plotCom
@@ -297,7 +297,7 @@ void Player::walkLeft() {
 			(tempL < 0 ? 1 : 0);
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
-	}	
+	}
 	_rawYTemp = _rawPlayer.y;
 
 	if (_vm->_room->codeWalls()) {
@@ -378,7 +378,7 @@ void Player::walkUpLeft() {
 	} else {
 		_rawXTemp = _rawPlayer.x - _vm->_screen->_scaleTable1[_scrollConst];
 	}
-	
+
 	walkOffset = _walkOffUL[_frame - _diagUpWalkMin].y;
 	tempL = _rawPlayerLow.y - _vm->_screen->_scaleTable2[walkOffset];
 	_rawYTempL = (byte)tempL;
@@ -446,7 +446,7 @@ void Player::walkDownLeft() {
 
 		++_frame;
 		calcManScale();
-		
+
 		// This code looks totally useless as 'si' is unconditionally set in plotCom1
 		//if (_vm->_currentMan != 3 && (_frame == 1 || _frame == 5))
 		//	warning("TODO: walkDownLeft - si = 0?");
@@ -668,7 +668,7 @@ void Player::checkScroll() {
 		if (!scrollRight()) {
 			if (_playerDirection == DOWNLEFT)
 				goto scrollUp;
-			
+
 			return;
 		}
 	} else if ((_playerDirection == UPRIGHT || _playerDirection == DOWNRIGHT ||
@@ -678,7 +678,7 @@ void Player::checkScroll() {
 		if (!scrollLeft()) {
 			if (_playerDirection == DOWNRIGHT)
 				goto scrollUp;
-	
+
 			return;
 		}
 	}
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 9bef5cf879..41f611d136 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -26,7 +26,7 @@
 namespace Access {
 
 const byte INITIAL_PALETTE[18 * 3] = {
-	0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00,
 	0xff, 0xff, 0xff,
 	0xf0, 0xf0, 0xf0,
 	0xe0, 0xe0, 0xe0,
@@ -73,7 +73,7 @@ const char *GO_MESSAGE = "YOU CAN'T CLIMB THAT.";
 const char *HELP_MESSAGE = "THIS OBJECT REQUIRES NO HINTS";
 const char *TALK_MESSAGE      = "THERE SEEMS TO BE NO RESPONSE.";
 const char *const GENERAL_MESSAGES[] = {
-	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE, 
+	LOOK_MESSAGE, OPEN_MESSAGE, MOVE_MESSAGE, GET_MESSAGE, USE_MESSAGE,
 	GO_MESSAGE, TALK_MESSAGE, HELP_MESSAGE, HELP_MESSAGE, USE_MESSAGE
 };
 
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index 97341b04b9..b3c3317307 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -266,7 +266,7 @@ void Room::setupRoom() {
 			screen._scrollCol -= sx + 1;
 		}
 	}
-	
+
 	if (screen._vWindowHeight == _playFieldHeight) {
 		screen._scrollY = 0;
 		screen._scrollRow = 0;
@@ -317,7 +317,7 @@ void Room::buildColumn(int playX, int screenX) {
 	if (playX < 0 || playX >= _playFieldWidth)
 		return;
 
-	const byte *pSrc = _playField + _vm->_screen->_scrollRow * 
+	const byte *pSrc = _playField + _vm->_screen->_scrollRow *
 		_playFieldWidth + playX;
 
 	// WORKAROUND: Original's use of '+ 1' would frequently cause memory overruns
@@ -406,7 +406,7 @@ Plotter::Plotter() {
 void Plotter::load(Common::SeekableReadStream *stream, int wallCount, int blockCount) {
 	// Load the wall count
 	_walls.resize(wallCount);
-	
+
 	for (int i = 0; i < wallCount; ++i)
 		_walls[i].left = stream->readSint16LE();
 	for (int i = 0; i < wallCount; ++i)
@@ -474,7 +474,7 @@ void Room::doCommands() {
 	}
 }
 
-void Room::cycleCommand(int incr) {	
+void Room::cycleCommand(int incr) {
 	int command = _selectCommand + incr;
 	if (command < -1)
 		command = 6;
@@ -560,7 +560,7 @@ void Room::executeCommand(int commandId) {
 	delete iconData;
 
 	// Draw the button as selected
-	_vm->_screen->plotImage(spr, _selectCommand + 2, 
+	_vm->_screen->plotImage(spr, _selectCommand + 2,
 		Common::Point(RMOUSE[_selectCommand][0], 176));
 
 	_vm->_screen->restoreScreen();
@@ -569,7 +569,7 @@ void Room::executeCommand(int commandId) {
 
 void Room::walkCursor() {
 	EventsManager &events = *_vm->_events;
-	
+
 	events._normalMouse = CURSOR_CROSSHAIRS;
 	events.setCursor(CURSOR_CROSSHAIRS);
 	_vm->_scripts->_sequence = 5000;
@@ -698,7 +698,7 @@ bool Room::codeWalls() {
 			if ((player._rawYTemp >= screen._orgY1) &&
 					(player._rawYTemp <= screen._orgY2)) {
 				jf._wallCode |= (calcLR(player._rawYTemp) - player._rawXTemp) < 0 ? 2 : 1;
-				jf._wallCode1 |= (calcLR(player._rawYTemp) - 
+				jf._wallCode1 |= (calcLR(player._rawYTemp) -
 					(player._rawXTemp + player._playerOffset.x)) < 0 ? 2 : 1;
 			}
 		}
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 053e824956..ec41f37d8c 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -109,29 +109,29 @@ typedef void(Scripts::*ScriptMethodPtr)();
 
 void Scripts::executeCommand(int commandIndex) {
 	static const ScriptMethodPtr COMMAND_LIST[] = {
-		&Scripts::cmdObject, &Scripts::cmdEndObject, &Scripts::cmdJumpLook, 
+		&Scripts::cmdObject, &Scripts::cmdEndObject, &Scripts::cmdJumpLook,
 		&Scripts::cmdJumpHelp, &Scripts::cmdJumpGet, &Scripts::cmdJumpMove,
-		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull, 
+		&Scripts::cmdJumpUse, &Scripts::cmdJumpTalk, &Scripts::cmdNull,
 		&Scripts::cmdPrint, &Scripts::cmdRetPos, &Scripts::cmdAnim,
-		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto, 
-		&Scripts::cmdAddScore, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory, 
-		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse, 
-		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd, 
-		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc, 
-		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetAbout, 
+		&Scripts::cmdSetFlag, &Scripts::cmdCheckFlag, &Scripts::cmdGoto,
+		&Scripts::cmdAddScore, &Scripts::cmdSetInventory, &Scripts::cmdCheckInventory,
+		&Scripts::cmdSetTex, &Scripts::cmdNewRoom, &Scripts::cmdConverse,
+		&Scripts::cmdCheckFrame, &Scripts::cmdCheckAnim, &Scripts::cmdSnd,
+		&Scripts::cmdRetNeg, &Scripts::cmdRetPos, &Scripts::cmdCheckLoc,
+		&Scripts::cmdSetAnim, &Scripts::cmdDispInv, &Scripts::cmdSetAbout,
 		&Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel,
-		&Scripts::cmdJumpGoto, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, 
-		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, 
-		&Scripts::cmdSetScroll, &Scripts::cmdSaveRect, &Scripts::cmdVideoEnded, 
-		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast, 
+		&Scripts::cmdJumpGoto, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo,
+		&Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer,
+		&Scripts::cmdSetScroll, &Scripts::cmdSaveRect, &Scripts::cmdVideoEnded,
+		&Scripts::cmdSetBufVid, &Scripts::cmdPlayBufVid, &Scripts::cmdRemoveLast,
 		&Scripts::cmdDoTravel, &Scripts::cmdCheckAbout, &Scripts::cmdSpecial,
-		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak, 
-		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait, 
-		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice, 
-		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound, 
+		&Scripts::cmdSetCycle, &Scripts::cmdCycle, &Scripts::cmdCharSpeak,
+		&Scripts::cmdTexSpeak, &Scripts::cmdTexChoice, &Scripts::cmdWait,
+		&Scripts::cmdSetConPos, &Scripts::cmdCheckVFrame, &Scripts::cmdJumpChoice,
+		&Scripts::cmdReturnChoice, &Scripts::cmdClearBlock, &Scripts::cmdLoadSound,
 		&Scripts::cmdFreeSound, &Scripts::cmdSetVideoSound, &Scripts::cmdPlayVideoSound,
-		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION, 
-		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff, 
+		&Scripts::cmdPrintWatch, &Scripts::cmdDispAbout, &Scripts::CMDPUSHLOCATION,
+		&Scripts::cmdCheckTravel, &Scripts::cmdBlock, &Scripts::cmdPlayerOff,
 		&Scripts::cmdPlayerOn, &Scripts::cmdDead, &Scripts::cmdFadeOut,
 		&Scripts::cmdEndVideo
 	};
@@ -139,11 +139,11 @@ void Scripts::executeCommand(int commandIndex) {
 	(this->*COMMAND_LIST[commandIndex])();
 }
 
-void Scripts::cmdObject() { 
+void Scripts::cmdObject() {
 	_vm->_bubbleBox->load(_data);
 }
 
-void Scripts::cmdEndObject() { 
+void Scripts::cmdEndObject() {
 	printString(GENERAL_MESSAGES[_vm->_room->_selectCommand]);
 }
 
@@ -154,35 +154,35 @@ void Scripts::cmdJumpLook() {
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpHelp() { 
+void Scripts::cmdJumpHelp() {
 	if (_vm->_room->_selectCommand == 8)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpGet() { 
+void Scripts::cmdJumpGet() {
 	if (_vm->_room->_selectCommand == 3)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpMove() { 
+void Scripts::cmdJumpMove() {
 	if (_vm->_room->_selectCommand == 2)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpUse() { 
+void Scripts::cmdJumpUse() {
 	if (_vm->_room->_selectCommand == 4)
 		cmdGoto();
 	else
 		_data->skip(2);
 }
 
-void Scripts::cmdJumpTalk() { 
+void Scripts::cmdJumpTalk() {
 	if (_vm->_room->_selectCommand == 6)
 		cmdGoto();
 	else
@@ -234,12 +234,12 @@ void Scripts::cmdRetPos() {
 	_returnCode = 0;
 }
 
-void Scripts::cmdAnim() { 
+void Scripts::cmdAnim() {
 	int animId = _data->readByte();
 	_vm->_animation->animate(animId);
 }
 
-void Scripts::cmdSetFlag() { 
+void Scripts::cmdSetFlag() {
 	int flagNum = _data->readByte();
 	byte flagVal = _data->readByte();
 	assert(flagNum < 256);
@@ -247,7 +247,7 @@ void Scripts::cmdSetFlag() {
 	_vm->_flags[flagNum] = flagVal;
 }
 
-void Scripts::cmdCheckFlag() { 
+void Scripts::cmdCheckFlag() {
 	int flagNum = _data->readUint16LE();
 	int flagVal = _data->readUint16LE();
 	assert(flagNum < 256);
@@ -258,7 +258,7 @@ void Scripts::cmdCheckFlag() {
 		_data->skip(2);
 }
 
-void Scripts::cmdGoto() { 
+void Scripts::cmdGoto() {
 	_sequence = _data->readUint16LE();
 	searchForSequence();
 }
@@ -272,7 +272,7 @@ void Scripts::cmdAddScore() {
 	_data->skip(1);
 }
 
-void Scripts::cmdSetInventory() { 
+void Scripts::cmdSetInventory() {
 	int itemId = _data->readByte();
 	int itemVal = _data->readByte();
 
@@ -282,7 +282,7 @@ void Scripts::cmdSetInventory() {
 	_vm->_inventory->_invChangeFlag = true;
 }
 
-void Scripts::cmdCheckInventory() { 
+void Scripts::cmdCheckInventory() {
 	int itemId = _data->readUint16LE();
 	int itemVal = _data->readUint16LE();
 
@@ -323,7 +323,7 @@ void Scripts::cmdSetTex() {
 
 #define CURRENT_ROOM 0xFF
 
-void Scripts::cmdNewRoom() { 
+void Scripts::cmdNewRoom() {
 	int roomNumber = _data->readByte();
 	if (roomNumber != CURRENT_ROOM)
 		_vm->_player->_roomNumber = roomNumber;
@@ -334,7 +334,7 @@ void Scripts::cmdNewRoom() {
 	cmdRetPos();
 }
 
-void Scripts::cmdConverse() { 
+void Scripts::cmdConverse() {
 	_vm->_conversation = _data->readUint16LE();
 	_vm->_room->clearRoom();
 	_vm->freeChar();
@@ -397,7 +397,7 @@ void Scripts::cmdCheckLoc() {
 		_data->skip(2);
 }
 
-void Scripts::cmdSetAnim() { 
+void Scripts::cmdSetAnim() {
 	int animId = _data->readByte();
 	Animation *anim = _vm->_animation->setAnimation(animId);
 
@@ -471,7 +471,7 @@ void Scripts::cmdJumpGoto() {
 		_data->skip(2);
 }
 
-void Scripts::cmdSetVideo() { 
+void Scripts::cmdSetVideo() {
 	Common::Point pt;
 	pt.x = _data->readSint16LE();
 	pt.y = _data->readSint16LE();
@@ -481,7 +481,7 @@ void Scripts::cmdSetVideo() {
 	_vm->_video->setVideo(_vm->_screen, pt, _vm->_extraCells[cellIndex]._vid, rate);
 }
 
-void Scripts::cmdPlayVideo() { 
+void Scripts::cmdPlayVideo() {
 	_vm->_video->playVideo();
 }
 
@@ -520,7 +520,7 @@ void Scripts::cmdSaveRect() {
 	error("TODO: DEMO - cmdSaveRect");
 }
 
-void Scripts::cmdVideoEnded() { 
+void Scripts::cmdVideoEnded() {
 	_vm->_events->pollEvents();
 
 	if (_vm->_video->_videoEnd) {
@@ -565,7 +565,7 @@ void Scripts::cmdCheckAbout() {
 	error("TODO: DEMO - cmdCheckAbout");
 }
 
-void Scripts::cmdSpecial() { 
+void Scripts::cmdSpecial() {
 	_specialFunction = _data->readUint16LE();
 	int p1 = _data->readUint16LE();
 	int p2 = _data->readUint16LE();
@@ -585,7 +585,7 @@ void Scripts::cmdSpecial() {
 	}
 }
 
-void Scripts::cmdSetCycle() { 
+void Scripts::cmdSetCycle() {
 	int startCycle = _data->readUint16LE();
 	int endCycle = _data->readUint16LE();
 	int timer = _data->readUint16LE();
@@ -628,7 +628,7 @@ void Scripts::cmdTexSpeak() {
 #define BTN_COUNT 6
 void Scripts::cmdTexChoice() {
 	static const int BTN_RANGES[BTN_COUNT][2] = {
-		{ 0, 76 }, { 77, 154 }, { 155, 232 }, { 233, 276 }, { 0, 0 }, 
+		{ 0, 76 }, { 77, 154 }, { 155, 232 }, { 233, 276 }, { 0, 0 },
 		{ 277, 319 }
 	};
 
@@ -714,12 +714,12 @@ void Scripts::cmdTexChoice() {
 			}
 		}
 	} while ((choice == -1) || ((choice == 2) && choice3Fl));
-	
+
 	_choice = choice + 1;
 	_vm->_bubbleBox->clearBubbles();
 }
 
-void Scripts::cmdWait() { 
+void Scripts::cmdWait() {
 	int time = _data->readSint16LE();
 	_vm->_timers[3]._timer = time;
 	_vm->_timers[3]._initTm = time;
@@ -750,7 +750,7 @@ void Scripts::cmdSetConPos() {
 	_texsOrg = Common::Point(x, y);
 }
 
-void Scripts::cmdCheckVFrame() { 
+void Scripts::cmdCheckVFrame() {
 	if (_vm->_video->_videoFrame == _data->readSint16LE())
 		cmdGoto();
 	else
@@ -759,7 +759,7 @@ void Scripts::cmdCheckVFrame() {
 
 void Scripts::cmdJumpChoice() {
 	int val = (_data->readUint16LE() & 0xFF);
-	
+
 	if (val == _choice) {
 		_sequence = _data->readUint16LE();
 		searchForSequence();
@@ -783,7 +783,7 @@ void Scripts::cmdLoadSound() {
 	_vm->_sound->_soundTable.push_back(SoundEntry(sound, 1));
 }
 
-void Scripts::cmdFreeSound() { 
+void Scripts::cmdFreeSound() {
 	SoundManager &sound = *_vm->_sound;
 
 	if (sound._soundTable.size() > 0 && sound._soundTable[0]._res) {
@@ -812,7 +812,7 @@ void Scripts::cmdSetVideoSound() {
 	_vm->_video->_soundFlag = false;
 }
 
-void Scripts::cmdPlayVideoSound() { 
+void Scripts::cmdPlayVideoSound() {
 	_vm->_video->playVideo();
 	if (_vm->_video->_soundFrame == _vm->_video->_videoFrame &&
 			!_vm->_video->_soundFlag) {
@@ -829,7 +829,7 @@ void Scripts::cmdPrintWatch() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdPrintWatch"); 
+	error("TODO: DEMO - cmdPrintWatch");
 }
 
 void Scripts::cmdDispAbout() {
@@ -837,11 +837,11 @@ void Scripts::cmdDispAbout() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdDispAbout"); 
+	error("TODO: DEMO - cmdDispAbout");
 }
 
 void Scripts::CMDPUSHLOCATION() {
-	error("TODO CMDPUSHLOCATION"); 
+	error("TODO CMDPUSHLOCATION");
 }
 
 void Scripts::cmdCheckTravel() {
@@ -849,7 +849,7 @@ void Scripts::cmdCheckTravel() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdCheckTravel"); 
+	error("TODO: DEMO - cmdCheckTravel");
 }
 
 void Scripts::cmdBlock() {
@@ -857,7 +857,7 @@ void Scripts::cmdBlock() {
 		CMDPUSHLOCATION();
 		return;
 	}
-	error("TODO: DEMO - cmdBlock"); 
+	error("TODO: DEMO - cmdBlock");
 }
 
 void Scripts::cmdPlayerOff() {
@@ -868,7 +868,7 @@ void Scripts::cmdPlayerOn() {
 	_vm->_player->_playerOff = false;
 }
 
-void Scripts::cmdDead() { 
+void Scripts::cmdDead() {
 	int deathId = _data->readByte();
 	_vm->dead(deathId);
 }
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index 7dab0a75f7..95576d212b 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -30,7 +30,7 @@
 
 namespace Access {
 
-SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) : 
+SoundManager::SoundManager(AccessEngine *vm, Audio::Mixer *mixer) :
 		_vm(vm), _mixer(mixer) {
 	_playingSound = false;
 	_isVoice = false;
@@ -71,7 +71,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 	byte *resourceData = res->data();
 	Audio::SoundHandle audioHandle;
 	Audio::RewindableAudioStream *audioStream = 0;
-	
+
 	assert(res->_size >= 32);
 
 	if (READ_BE_UINT32(resourceData) == MKTAG('R','I','F','F')) {
@@ -92,7 +92,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 		//   word    - actual sample size (should be resource-size - 32)
 		byte internalSampleRate = resourceData[5];
 		int sampleSize = READ_LE_UINT16(resourceData + 7);
-	
+
 		assert( (sampleSize + 32) == res->_size);
 
 		int sampleRate = 0;
@@ -105,12 +105,12 @@ void SoundManager::playSound(Resource *res, int priority) {
 			error("Unexpected internal Sample Rate %d", internalSampleRate);
 			return;
 		}
-	
+
 		audioStream = Audio::makeRawStream(resourceData + 32, sampleSize, sampleRate, 0);
 
 	} else
 		error("Unknown format");
-	
+
 	audioHandle = Audio::SoundHandle();
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &audioHandle,
 						audioStream, -1, _mixer->kMaxChannelVolume, 0,
@@ -119,7 +119,7 @@ void SoundManager::playSound(Resource *res, int priority) {
 	/*
 	Audio::QueuingAudioStream *audioStream = Audio::makeQueuingAudioStream(22050, false);
 	audioStream->queueBuffer(data, size, DisposeAfterUse::YES, 0);
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1, 
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, audioStream, -1,
 		Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::YES, false);
 		*/
 }
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 776c58a83b..abe833ce42 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -54,7 +54,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 	_header._height = _videoData->_stream->readUint16LE();
 	_videoData->_stream->skip(1);
 	_header._flags = (VideoFlags)_videoData->_stream->readByte();
-	
+
 	_startCoord = (byte *)vidSurface->getBasePtr(pt.x, pt.y);
 	_frameCount = _header._frameCount - 2;
 	_xCount = _header._width;
@@ -72,7 +72,7 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 
 		if (vidSurface == _vm->_screen)
 			_vm->_newRects.push_back(Common::Rect(pt.x, pt.y, pt.x + _xCount, pt.y + _scanCount));
-		
+
 		getFrame();
 	}
 
@@ -115,7 +115,7 @@ void VideoPlayer::playVideo() {
 			pDest += count;
 		} else {
 			// Read count number of pixels
-			
+
 			// Load across lines if necessary
 			while (count >= (pLine + _xCount - pDest)) {
 				int lineCount = (pLine + _xCount - pDest);
@@ -143,12 +143,12 @@ void VideoPlayer::playVideo() {
 void VideoPlayer::copyVideo() {
 	_vm->_player->calcPlayer();
 	Common::Rect r = Common::Rect(_vm->_vidX - _vm->_screen->_bufferStart.x,
-		_vm->_vidY - _vm->_screen->_bufferStart.y, 
+		_vm->_vidY - _vm->_screen->_bufferStart.y,
 		_vm->_vidX - _vm->_screen->_bufferStart.x + _header._width,
 		_vm->_vidY - _vm->_screen->_bufferStart.y + _header._height);
 	if (!_vm->_screen->clip(r))
 		return;
-	
+
 	_vm->_newRects.push_back(r);
 	int vh = _header._height;
 	int vw = _header._width;