MADS: Remove trailing whitespace

55 files changed, 260 insertions, 260 deletions

diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index fd6a90f3d2..88a57d6a4e 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -127,7 +127,7 @@ void MADSAction::set() {
 		// Two 'look' actions in succession, so the action becomes 'Look around'
 		_statusText = kLookAroundStr;
 	} else {
-		if ((_commandSource == CAT_INV_VOCAB) && (_selectedRow >= 0) 
+		if ((_commandSource == CAT_INV_VOCAB) && (_selectedRow >= 0)
 				&& (_verbType == VERB_THAT) && (_prepType == PREP_NONE)) {
 			// Use/to action
 			int invIndex = userInterface._selectedInvIndex;
@@ -276,7 +276,7 @@ void MADSAction::refresh() {
 	}
 
 	if (!_statusText.empty()) {
-		if ((_vm->_game->_screenObjects._inputMode == kInputBuildingSentences) || 
+		if ((_vm->_game->_screenObjects._inputMode == kInputBuildingSentences) ||
 				(_vm->_game->_screenObjects._inputMode == kInputLimitedSentences)) {
 			Font *font = _vm->_font->getFont(FONT_MAIN);
 			int textSpacing = -1;
@@ -436,7 +436,7 @@ void MADSAction::checkActionAtMousePos() {
 					_hotspotId = userInterface._selectedInvIndex;
 					_articleNumber = _prepType;
 
-					if ((_verbType == VERB_THIS && _prepType == PREP_NONE) || 
+					if ((_verbType == VERB_THIS && _prepType == PREP_NONE) ||
 							(_verbType == VERB_THAT && _prepType != PREP_NONE))
 						_interAwaiting = AWAITING_RIGHT_MOUSE;
 					else
diff --git a/engines/mads/action.h b/engines/mads/action.h
index 24521d074d..af52d2c7a2 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -29,7 +29,7 @@
 
 namespace MADS {
 
-enum TriggerMode { 
+enum TriggerMode {
 	SEQUENCE_TRIGGER_PARSER = 0,		// Triggers parser
 	SEQUENCE_TRIGGER_DAEMON = 1,		// Triggers step/daemon code
 	SEQUENCE_TRIGGER_PREPARE = 2		// Triggers preparser
@@ -61,7 +61,7 @@ enum {
 enum VerbType { VERB_ONLY, VERB_THIS, VERB_THAT };
 
 enum PrepType {
-	PREP_NONE, PREP_WITH, PREP_TO, PREP_AT, PREP_FROM, PREP_ON, PREP_IN, 
+	PREP_NONE, PREP_WITH, PREP_TO, PREP_AT, PREP_FROM, PREP_ON, PREP_IN,
 	PREP_UNDER, PREP_BEHIND, PREP_RELATIONAL = 0xff
 };
 
diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 32f432001e..089e21d08e 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -26,7 +26,7 @@
 #define FILENAME_SIZE 13
 
 namespace MADS {
-	
+
 void AAHeader::load(Common::SeekableReadStream *f) {
 	_spriteSetsCount = f->readUint16LE();
 	_miscEntriesCount = f->readUint16LE();
@@ -232,7 +232,7 @@ void Animation::load(UserInterface &interfaceSurface, MSurface &depthSurface,
 
 		delete frameStream;
 	}
-	
+
 	_miscEntries.clear();
 	_uiEntries.clear();
 	if (_header._miscEntriesCount > 0) {
@@ -255,7 +255,7 @@ void Animation::load(UserInterface &interfaceSurface, MSurface &depthSurface,
 
 		delete miscStream;
 	}
-	
+
 	// If the animation specifies a font, then load it for access
 	delete _font;
 	if (_header._flags & ANIMFLAG_CUSTOM_FONT) {
@@ -264,7 +264,7 @@ void Animation::load(UserInterface &interfaceSurface, MSurface &depthSurface,
 	} else {
 		_font = nullptr;
 	}
-	
+
 	// Load all the sprite sets for the animation
 	for (uint i = 0; i < _spriteSets.size(); ++i)
 		delete _spriteSets[i];
@@ -398,7 +398,7 @@ void Animation::loadInterface(UserInterface &interfaceSurface, MSurface &depthSu
 	}
 }
 
-bool Animation::hasScroll() const { 
+bool Animation::hasScroll() const {
 	return (_header._scrollPosition.x != 0) || (_header._scrollPosition.x != 0);
 }
 
@@ -452,7 +452,7 @@ void Animation::update() {
 		scene._backgroundSurface.scrollY(_header._scrollPosition.y);
 		scene._spriteSlots.fullRefresh();
 	}
-	
+
 	// Handle any offset adjustment for sprites as of this frame
 	bool paChanged = false;
 	if (scene._posAdjust.x != misc._posAdjust.x) {
@@ -542,7 +542,7 @@ void Animation::update() {
 			_vm->_palette->setEntry(colIndex + 1, me._rgb2[0], me._rgb2[1], me._rgb2[2]);
 
 			// Add a kernel message to display the given text
-			me._kernelMsgIndex = scene._kernelMessages.add(me._pos, colIndex * 0x101 + 0x100, 
+			me._kernelMsgIndex = scene._kernelMessages.add(me._pos, colIndex * 0x101 + 0x100,
 				0, 0, INDEFINITE_TIMEOUT, me._msg);
 			assert(me._kernelMsgIndex >= 0);
 			++_messageCtr;
diff --git a/engines/mads/animation.h b/engines/mads/animation.h
index aab1743b42..3c0c2547d4 100644
--- a/engines/mads/animation.h
+++ b/engines/mads/animation.h
@@ -33,9 +33,9 @@
 
 namespace MADS {
 
-enum AnimFlag { 
+enum AnimFlag {
 	ANIMFLAG_DITHER				= 0x0001,	// Dither to 16 colors
-	ANIMFLAG_CUSTOM_FONT		= 0x0020,	// Load ccustom font 
+	ANIMFLAG_CUSTOM_FONT		= 0x0020,	// Load ccustom font
 	ANIMFLAG_LOAD_BACKGROUND	= 0x0100,	// Load background
 	ANIMFLAG_LOAD_BACKGROUND_ONLY = 0x0200	// Load background only
 };
diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp
index bf9647dda4..1cb174bbed 100644
--- a/engines/mads/assets.cpp
+++ b/engines/mads/assets.cpp
@@ -40,7 +40,7 @@ SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int
 
 	file.close();
 }
-	
+
 SpriteAsset::SpriteAsset(MADSEngine *vm, Common::SeekableReadStream *stream, int flags) :
 		_vm(vm) {
 	load(stream, flags);
@@ -152,8 +152,8 @@ void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) {
 		frame._bounds.setHeight(spriteStream->readUint16LE());
 
 		if (curFrame == 0)
-			debugC(1, kDebugGraphics, "%i frames, x = %i, y = %i, w = %i, h = %i\n", 
-			_frameCount, frame._bounds.left, frame._bounds.top, 
+			debugC(1, kDebugGraphics, "%i frames, x = %i, y = %i, w = %i, h = %i\n",
+			_frameCount, frame._bounds.left, frame._bounds.top,
 			frame._bounds.width(), frame._bounds.height());
 
 		if (_mode == 0) {
diff --git a/engines/mads/compression.cpp b/engines/mads/compression.cpp
index 2190fc4ac0..6563de51a3 100644
--- a/engines/mads/compression.cpp
+++ b/engines/mads/compression.cpp
@@ -34,7 +34,7 @@ bool MadsPack::isCompressed(Common::SeekableReadStream *stream) {
 	char tempBuffer[8];
 	stream->seek(0);
 	if (stream->read(tempBuffer, 8) == 8) {
-		if (!strncmp(tempBuffer, madsPackString, 8)) 
+		if (!strncmp(tempBuffer, madsPackString, 8))
 			return true;
 	}
 
@@ -58,7 +58,7 @@ void MadsPack::initialise(Common::SeekableReadStream *stream) {
 	stream->seek(14);
 	_count = stream->readUint16LE();
 	_items = new MadsPackEntry[_count];
-	
+
 	byte *headerData = new byte[0xA0];
 	byte *header = headerData;
 	stream->read(headerData, 0xA0);
@@ -77,7 +77,7 @@ void MadsPack::initialise(Common::SeekableReadStream *stream) {
 			// Decompress the entry
 			byte *compressedData = new byte[_items[i].compressedSize];
 			stream->read(compressedData, _items[i].compressedSize);
-			
+
 			FabDecompressor fab;
 			fab.decompress(compressedData, _items[i].compressedSize, _items[i].data, _items[i].size);
 			delete[] compressedData;
@@ -100,7 +100,7 @@ void FabDecompressor::decompress(const byte *srcData, int srcSize, byte *destDat
 	byte copyLen, copyOfsShift, copyOfsMask, copyLenMask;
 	unsigned long copyOfs;
 	byte *destP;
-	
+
 	// Validate that the data starts with the FAB header
 	if (strncmp((const char *)srcData, "FAB", 3) != 0)
 		error("FabDecompressor - Invalid compressed data");
@@ -119,7 +119,7 @@ void FabDecompressor::decompress(const byte *srcData, int srcSize, byte *destDat
 	_srcData = srcData;
 	_srcP = _srcData + 6;
 	_srcSize = srcSize;
-	_bitsLeft = 16;	
+	_bitsLeft = 16;
 	_bitBuffer = READ_LE_UINT16(srcData + 4);
 
 	for (;;) {
diff --git a/engines/mads/compression.h b/engines/mads/compression.h
index aa1f0d9bdc..c752b570a2 100644
--- a/engines/mads/compression.h
+++ b/engines/mads/compression.h
@@ -54,12 +54,12 @@ public:
 	~MadsPack();
 
 	int getCount() const { return _count; }
-	MadsPackEntry &getItem(int index) const { 
+	MadsPackEntry &getItem(int index) const {
 		assert(index < _count);
 		return _items[index]; }
-	MadsPackEntry &operator[](int index) const { 
+	MadsPackEntry &operator[](int index) const {
 		assert(index < _count);
-		return _items[index]; 
+		return _items[index];
 	}
 	Common::MemoryReadStream *getItemStream(int index) {
 		assert(index < _count);
diff --git a/engines/mads/debugger.cpp b/engines/mads/debugger.cpp
index 80a8cb748e..3594c83d36 100644
--- a/engines/mads/debugger.cpp
+++ b/engines/mads/debugger.cpp
@@ -175,7 +175,7 @@ bool Debugger::Cmd_DumpFile(int argc, const char **argv) {
 		} else {
 			outFile.open(argv[1]);
 			byte *data = new byte[inFile.size()];
-			
+
 			inFile.read(data, inFile.size());
 			outFile.write(data, inFile.size());
 
@@ -186,7 +186,7 @@ bool Debugger::Cmd_DumpFile(int argc, const char **argv) {
 			DebugPrintf("File written successfully.\n");
 		}
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 519b273efb..e68411a4bb 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -40,7 +40,7 @@ Dialog::~Dialog() {
 
 void Dialog::save(MSurface *s) {
 	_savedSurface = new MSurface(_width, _height);
-	s->copyTo(_savedSurface, 
+	s->copyTo(_savedSurface,
 		Common::Rect(_position.x, _position.y, _position.x + _width, _position.y + _height),
 		Common::Point());
 
@@ -87,7 +87,7 @@ void Dialog::drawContent(const Common::Rect &r, int seed, byte color1, byte colo
 
 	for (int yp = 0; yp < r.height(); ++yp) {
 		byte *destP = _vm->_screen.getBasePtr(r.left, r.top + yp);
-		
+
 		for (int xp = 0; xp < r.width(); ++xp) {
 			uint16 seedAdjust = currSeed;
 			currSeed += 0x181D;
@@ -103,13 +103,13 @@ void Dialog::drawContent(const Common::Rect &r, int seed, byte color1, byte colo
 
 /*------------------------------------------------------------------------*/
 
-TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName, 
+TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
 		const Common::Point &pos, int maxChars):
 		Dialog(vm) {
 	_vm = vm;
 	_font = _vm->_font->getFont(fontName);
 	_position = pos;
-	
+
 	_vm->_font->setColors(TEXTDIALOG_BLACK, TEXTDIALOG_BLACK, TEXTDIALOG_BLACK, TEXTDIALOG_BLACK);
 
 	_innerWidth = (_font->maxWidth() + 1) * maxChars;
@@ -123,8 +123,8 @@ TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
 	_askXp = 0;
 
 	// Save the high end of the palette, and set up the entries for dialog display
-	Common::copy(&_vm->_palette->_mainPalette[TEXTDIALOG_CONTENT1 * 3], 
-		&_vm->_palette->_mainPalette[TEXTDIALOG_CONTENT1 * 3 + 8 * 3], 
+	Common::copy(&_vm->_palette->_mainPalette[TEXTDIALOG_CONTENT1 * 3],
+		&_vm->_palette->_mainPalette[TEXTDIALOG_CONTENT1 * 3 + 8 * 3],
 		&_cyclingPalette[0]);
 	Palette::setGradient(_vm->_palette->_mainPalette, TEXTDIALOG_CONTENT1, 2, 0x90, 0x80);
 	Palette::setGradient(_vm->_palette->_mainPalette, TEXTDIALOG_EDGE, 2, 0x9C, 0x70);
@@ -177,7 +177,7 @@ void TextDialog::wordWrap(const Common::String &line) {
 
 	if (!line.empty()) {
 		const char *srcP = line.c_str();
-		
+
 		do {
 			tempLine = "";
 			bool endWord = false;
@@ -274,11 +274,11 @@ void TextDialog::draw() {
 	Dialog::draw();
 
 	// Draw the text lines
-	int lineYp = _position.y + 5; 
+	int lineYp = _position.y + 5;
 	for (int lineNum = 0; lineNum <= _numLines; ++lineNum) {
 		if (_lineXp[lineNum] == -1) {
 			// Draw a line across the entire dialog
-			_vm->_screen.hLine(_position.x + 2, 
+			_vm->_screen.hLine(_position.x + 2,
 				lineYp + (_font->getHeight() + 1)  / 2,
 				_position.x + _width - 4, TEXTDIALOG_BLACK);
 		} else {
@@ -288,7 +288,7 @@ void TextDialog::draw() {
 			if (_lineXp[lineNum] & 0x40)
 				++yp;
 
-			_font->writeString(&_vm->_screen, _lines[lineNum], 
+			_font->writeString(&_vm->_screen, _lines[lineNum],
 				Common::Point(xp, yp), 1);
 
 			if (_lineXp[lineNum] & 0x80) {
@@ -314,7 +314,7 @@ void TextDialog::drawWithInput() {
 	drawContent(Common::Rect(_position.x + 2, _position.y + 2,
 		_position.x + _width - 2, _position.y + _height - 2), 0,
 		TEXTDIALOG_CONTENT1, TEXTDIALOG_CONTENT2);
-	
+
 	error("TODO: drawWithInput");
 }
 
@@ -342,7 +342,7 @@ void TextDialog::show() {
 
 /*------------------------------------------------------------------------*/
 
-MessageDialog::MessageDialog(MADSEngine *vm, int maxChars, ...): 
+MessageDialog::MessageDialog(MADSEngine *vm, int maxChars, ...):
 		TextDialog(vm, FONT_INTERFACE, Common::Point(-1, -1), maxChars) {
 	// Add in passed line list
 	va_list va;
diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index 884f7e6866..d06611b1c4 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -123,7 +123,7 @@ public:
 	 * @param pos			Position for window top-left
 	 * @param maxChars		Horizontal width of window in characters
 	 */
-	TextDialog(MADSEngine *vm, const Common::String &fontName, const Common::Point &pos, 
+	TextDialog(MADSEngine *vm, const Common::String &fontName, const Common::Point &pos,
 		int maxChars);
 
 	/**
@@ -162,7 +162,7 @@ public:
 	void addInput();
 
 	/**
-	 * Adds a bar line to separate sections of text 
+	 * Adds a bar line to separate sections of text
 	 */
 	void addBarLine();
 
diff --git a/engines/mads/dragonsphere/game_dragonsphere.cpp b/engines/mads/dragonsphere/game_dragonsphere.cpp
index 7d3864e680..49c38460e2 100644
--- a/engines/mads/dragonsphere/game_dragonsphere.cpp
+++ b/engines/mads/dragonsphere/game_dragonsphere.cpp
@@ -44,7 +44,7 @@ ProtectionResult GameDragonsphere::checkCopyProtection() {
 	/*
 	// DEBUG: Flag copy protection failure
 	_globals[5] = -1;
-	
+
 	if (!ConfMan.getBool("copy_protection"))
 		return true;
 
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 5f9a899f65..3d7504c0bd 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -31,11 +31,11 @@
 
 namespace MADS {
 
-enum CursorType { CURSOR_NONE = 0, CURSOR_ARROW = 1, CURSOR_WAIT = 2, CURSOR_GO_DOWN = 3, 
+enum CursorType { CURSOR_NONE = 0, CURSOR_ARROW = 1, CURSOR_WAIT = 2, CURSOR_GO_DOWN = 3,
 	CURSOR_GO_UP = 4, CURSOR_GO_LEFT = 5, CURSOR_GO_RIGHT = 6 };
 
 #define GAME_FRAME_RATE 50
-#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE) 
+#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
 class MADSEngine;
 
@@ -154,7 +154,7 @@ public:
 	void initVars();
 
 	/**
-	 * Returns true if there's any pending keys to be processed 
+	 * Returns true if there's any pending keys to be processed
 	 */
 	bool isKeyPressed() const { return !_pendingKeys.empty(); }
 };
diff --git a/engines/mads/font.cpp b/engines/mads/font.cpp
index ba10099184..6f2d2b8168 100644
--- a/engines/mads/font.cpp
+++ b/engines/mads/font.cpp
@@ -145,7 +145,7 @@ int Font::writeString(MSurface *surface, const Common::String &msg, const Common
 
 	int x = pt.x;
 	int y = pt.y;
-	
+
 	int skipY = 0;
 	if (y < 0) {
 		skipY = -y;
@@ -173,7 +173,7 @@ int Font::writeString(MSurface *surface, const Common::String &msg, const Common
 	while (*text) {
 		char theChar = (*text++) & 0x7F;
 		int charWidth = _charWidths[(byte)theChar];
-		
+
 		if (charWidth > 0) {
 
 			if (xPos + charWidth > xEnd)
@@ -212,7 +212,7 @@ int Font::writeString(MSurface *surface, const Common::String &msg, const Common
 		}
 
 		xPos += charWidth + spaceWidth;
-		
+
 	}
 
 	return xPos;
diff --git a/engines/mads/font.h b/engines/mads/font.h
index 1511b60a82..1d733280df 100644
--- a/engines/mads/font.h
+++ b/engines/mads/font.h
@@ -39,8 +39,8 @@ namespace MADS {
 #define FONT_TELE "*FONTTELE.FF"	// Not in Phantom
 #define FONT_PHAN "*FONTPHAN.FF"	// Phantom only
 
-enum SelectionMode { 
-	SELMODE_UNSELECTED = 0, SELMODE_HIGHLIGHTED = 1, SELMODE_SELECTED = 2 
+enum SelectionMode {
+	SELMODE_UNSELECTED = 0, SELMODE_HIGHLIGHTED = 1, SELMODE_SELECTED = 2
 };
 
 class MADSEngine;
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 65790d3c3d..3f6c8e09d5 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -56,7 +56,7 @@ Game *Game::init(MADSEngine *vm) {
 	return nullptr;
 }
 
-Game::Game(MADSEngine *vm): _vm(vm), _surface(nullptr), _objects(vm), 
+Game::Game(MADSEngine *vm): _vm(vm), _surface(nullptr), _objects(vm),
 		_scene(vm), _screenObjects(vm), _player(vm) {
 	_sectionNumber = _priorSectionNumber = 0;
 	_loadGameSlot = -1;
@@ -106,7 +106,7 @@ void Game::run() {
 
 	_statusFlag = true;
 	int protectionResult = -1;
-	
+
 	if (_loadGameSlot == -1) {
 		protectionResult = checkCopyProtection();
 		switch (protectionResult) {
@@ -203,7 +203,7 @@ void Game::sectionLoop() {
 		_screenObjects._forceRescan = true;
 		_screenObjects._inputMode = kInputBuildingSentences;
 		_scene._userInterface._scrollbarActive = SCROLLBAR_NONE;
-		
+
 		_player._loadsFirst = true;
 
 		_scene._sceneLogic->setup();
@@ -222,7 +222,7 @@ void Game::sectionLoop() {
 		_scene._scenePaletteUsage.push_back(PaletteUsage::UsageEntry(0xF1));
 		_scene._scenePaletteUsage.push_back(PaletteUsage::UsageEntry(0xF2));
 		_vm->_palette->_paletteUsage.load(&_scene._scenePaletteUsage);
-		
+
 		if (!_player._spritesLoaded && _player._loadsFirst) {
 			if (_player.loadSprites(""))
 				_vm->quitGame();
@@ -342,9 +342,9 @@ void Game::initSection(int sectionNumber) {
 		_vm->_palette->setPalette(_vm->_palette->_mainPalette, 0, 4);
 
 	_vm->_events->loadCursors("*CURSOR.SS");
-	
+
 	assert(_vm->_events->_cursorSprites);
-	_vm->_events->setCursor2((_vm->_events->_cursorSprites->getCount() <= 1) ? 
+	_vm->_events->setCursor2((_vm->_events->_cursorSprites->getCount() <= 1) ?
 		CURSOR_ARROW : CURSOR_WAIT);
 }
 
@@ -474,9 +474,9 @@ void Game::synchronize(Common::Serializer &s, bool phase1) {
 void Game::loadGame(int slotNumber) {
 	_saveFile = g_system->getSavefileManager()->openForLoading(
 		_vm->generateSaveName(slotNumber));
-	
+
 	Common::Serializer s(_saveFile, nullptr);
-	
+
 	// Load the savaegame header
 	MADSSavegameHeader header;
 	if (!readSavegameHeader(_saveFile, header))
diff --git a/engines/mads/globals.cpp b/engines/mads/globals.cpp
index 2343dd9c68..f46ca1eb65 100644
--- a/engines/mads/globals.cpp
+++ b/engines/mads/globals.cpp
@@ -39,7 +39,7 @@ void Globals::synchronize(Common::Serializer &s) {
 		for (int idx = 0; idx < count; ++idx) {
 			v = _data[idx];
 			s.syncAsSint16LE(v);
-		}	
+		}
 	} else {
 		_data.clear();
 		for (int idx = 0; idx < count; ++idx) {
diff --git a/engines/mads/inventory.cpp b/engines/mads/inventory.cpp
index fecb1b34eb..d41a55fe47 100644
--- a/engines/mads/inventory.cpp
+++ b/engines/mads/inventory.cpp
@@ -31,7 +31,7 @@ void InventoryObject::synchronize(Common::Serializer &s) {
 	s.syncAsUint16LE(_roomNumber);
 	s.syncAsByte(_article);
 	s.syncAsByte(_vocabCount);
-	
+
 	for (int i = 0; i < 3; ++i) {
 		s.syncAsByte(_vocabList[i]._verbType);
 		s.syncAsByte(_vocabList[i]._prepType);
@@ -142,7 +142,7 @@ void InventoryObjects::addToInventory(int objectId) {
 
 		(*this)[objectId]._roomNumber = PLAYER_INVENTORY;
 
-		if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && 
+		if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE &&
 				_vm->_game->_screenObjects._inputMode == kInputBuildingSentences) {
 			userInterface.categoryChanged();
 			userInterface.selectObject(userInterface._selectedInvIndex);
@@ -164,7 +164,7 @@ void InventoryObjects::removeFromInventory(int objectId, int newScene) {
 	int selectedIndex = userInterface._selectedInvIndex;
 	bool noSelection = selectedIndex < 0;
 
-	if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && 
+	if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE &&
 			_vm->_game->_screenObjects._inputMode == kInputBuildingSentences)
 		userInterface.selectObject(-1);
 
@@ -186,7 +186,7 @@ void InventoryObjects::removeFromInventory(int objectId, int newScene) {
 			newIndex = 0;
 	}
 
-	if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE && 
+	if (_vm->_game->_kernelMode == KERNEL_ACTIVE_CODE &&
 			_vm->_game->_screenObjects._inputMode == kInputBuildingSentences) {
 		userInterface.categoryChanged();
 		userInterface.selectObject(newIndex);
diff --git a/engines/mads/inventory.h b/engines/mads/inventory.h
index f3c63f8c4b..9d79431050 100644
--- a/engines/mads/inventory.h
+++ b/engines/mads/inventory.h
@@ -62,7 +62,7 @@ private:
 public:
 	SynchronizedList _inventoryList;
 
-	/** 
+	/**
 	 * Constructor
 	 */
 	InventoryObjects(MADSEngine *vm): _vm(vm) {}
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 9587efa443..193346dcf9 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -37,7 +37,7 @@ namespace MADS {
 
 MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
 		_gameDescription(gameDesc), Engine(syst), _randomSource("MADS") {
-	
+
 	// Initialise fields
 	_easyMouse = true;
 	_invObjectsAnimated = true;
@@ -122,7 +122,7 @@ int MADSEngine::hypotenuse(int xv, int yv) {
 }
 
 bool MADSEngine::canLoadGameStateCurrently() {
-	return !_game->_winStatus && !_game->globals()[5] 
+	return !_game->_winStatus && !_game->globals()[5]
 		&& _dialogs->_pendingDialog == DIALOG_NONE
 		&& _events->_cursorId != CURSOR_WAIT;
 }
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 61d61a2564..3f325fd6a1 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -137,7 +137,7 @@ public:
 	Common::String generateSaveName(int slot);
 
 	/**
-	 * Handles loading a game via the GMM 
+	 * Handles loading a game via the GMM
 	 */
 	virtual Common::Error loadGameState(int slot);
 
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index 08e86e20de..e498ab9621 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -50,9 +50,9 @@ void KernelMessages::clear() {
 	scene._textSpacing = -1;
 }
 
-int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags, 
+int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 		uint8 abortTimers, uint32 timeout, const Common::String &msg) {
-	Scene &scene = _vm->_game->_scene; 
+	Scene &scene = _vm->_game->_scene;
 
 	// Find a free slot
 	uint idx = 0;
@@ -80,7 +80,7 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 	rec._actionDetails = scene._action._activeAction;
 
 	if (flags & KMSG_PLAYER_TIMEOUT)
-		rec._frameTimer = _vm->_game->_player._ticksAmount + 
+		rec._frameTimer = _vm->_game->_player._ticksAmount +
 			_vm->_game->_player._priorTimer;
 
 	return idx;
@@ -88,7 +88,7 @@ int KernelMessages::add(const Common::Point &pt, uint fontColor, uint8 flags,
 
 int KernelMessages::addQuote(int quoteId, int abortTimers, uint32 timeout) {
 	Common::String quoteStr = _vm->_game->getQuote(quoteId);
-	return add(Common::Point(), 0x1110, KMSG_PLAYER_TIMEOUT | KMSG_CENTER_ALIGN, 
+	return add(Common::Point(), 0x1110, KMSG_PLAYER_TIMEOUT | KMSG_CENTER_ALIGN,
 		abortTimers, timeout, quoteStr);
 }
 
@@ -104,7 +104,7 @@ void KernelMessages::scrollMessage(int msgIndex, int numTicks, bool quoted) {
 	Common::String msg = _entries[msgIndex]._msg;
 
 	if (_entries[msgIndex]._flags & KMSG_PLAYER_TIMEOUT)
-		_entries[msgIndex]._frameTimer2 = _vm->_game->_player._ticksAmount + 
+		_entries[msgIndex]._frameTimer2 = _vm->_game->_player._ticksAmount +
 		_vm->_game->_player._priorTimer;
 
 	_entries[msgIndex]._frameTimer = _entries[msgIndex]._frameTimer2;
@@ -269,7 +269,7 @@ void KernelMessages::processText(int msgIndex) {
 
 	if (msg._textDisplayIndex < 0) {
 		// Need to create a new text display entry for this message
-		int idx = scene._textDisplay.add(x1, y1, msg._color1 | (msg._color2 << 8), 
+		int idx = scene._textDisplay.add(x1, y1, msg._color1 | (msg._color2 << 8),
 			scene._textSpacing, displayMsg, _talkFont);
 		if (idx >= 0)
 			msg._textDisplayIndex = idx;
@@ -330,7 +330,7 @@ void TextDisplayList::reset() {
 		(*this)[i]._active = false;
 }
 
-int TextDisplayList::add(int xp, int yp, uint fontColor, int charSpacing, 
+int TextDisplayList::add(int xp, int yp, uint fontColor, int charSpacing,
 		const Common::String &msg, Font *font) {
 	int usedSlot = -1;
 
@@ -387,7 +387,7 @@ void TextDisplayList::draw(MSurface *s) {
 		if (td._active && (td._expire >= 0)) {
 			td._font->setColors(0xFF, td._color1, td._color2, 0);
 			td._font->writeString(s, td._msg,
-				Common::Point(td._bounds.left, td._bounds.top), 
+				Common::Point(td._bounds.left, td._bounds.top),
 				td._spacing, td._bounds.width());
 		}
 	}
diff --git a/engines/mads/messages.h b/engines/mads/messages.h
index a6d39281a6..8aa8cd54da 100644
--- a/engines/mads/messages.h
+++ b/engines/mads/messages.h
@@ -36,8 +36,8 @@ namespace MADS {
 #define TEXT_DISPLAY_SIZE 40
 
 enum KernelMessageFlags {
-	KMSG_QUOTED = 1, KMSG_PLAYER_TIMEOUT = 2, KMSG_SEQ_ENTRY = 4, KMSG_SCROLL = 8, 
-	KMSG_RIGHT_ALIGN = 0x10, KMSG_CENTER_ALIGN = 0x20, KMSG_EXPIRE = 0x40, 
+	KMSG_QUOTED = 1, KMSG_PLAYER_TIMEOUT = 2, KMSG_SEQ_ENTRY = 4, KMSG_SCROLL = 8,
+	KMSG_RIGHT_ALIGN = 0x10, KMSG_CENTER_ALIGN = 0x20, KMSG_EXPIRE = 0x40,
 	KMSG_ACTIVE = 0x80
 };
 
@@ -74,7 +74,7 @@ public:
 	~KernelMessages();
 
 	void clear();
-	int add(const Common::Point &pt, uint fontColor, uint8 flags, uint8 abortTimers, 
+	int add(const Common::Point &pt, uint fontColor, uint8 flags, uint8 abortTimers,
 		uint32 timeout, const Common::String &msg);
 	int addQuote(int quoteId, int abortTimers, uint32 timeout);
 	void scrollMessage(int msgIndex, int numTicks, bool quoted);
@@ -115,7 +115,7 @@ public:
 	void expire(int idx);
 
 	int add(int xp, int yp, uint fontColor, int charSpacing, const Common::String &, Font *font);
-	
+
 	/**
 	 * Reset all of the text display entries in the list to inactive
 	 */
@@ -126,7 +126,7 @@ public:
 	 * @param surface	Surface
 	 */
 	void draw(MSurface *s);
-	
+
 	/**
 	 * Determine dirty areas for active text areas
 	 */
diff --git a/engines/mads/msurface.cpp b/engines/mads/msurface.cpp
index 64b3ae1f23..5d1e948f77 100644
--- a/engines/mads/msurface.cpp
+++ b/engines/mads/msurface.cpp
@@ -37,10 +37,10 @@ MSurface::MSurface() {
 	_freeFlag = false;
 }
 
-MSurface::MSurface(int width, int height) { 
+MSurface::MSurface(int width, int height) {
 	pixels = nullptr;
 	_freeFlag = false;
-	setSize(width, height); 
+	setSize(width, height);
 }
 
 MSurface::~MSurface() {
@@ -203,7 +203,7 @@ void MSurface::drawSprite(const Common::Point &pt, SpriteInfo &info, const Commo
 		}
 
 	}
-	
+
 	delete[] scaledLineBuf;
 
 }
@@ -212,10 +212,10 @@ void MSurface::empty() {
 	Common::fill(getBasePtr(0, 0), getBasePtr(0, h), 0);
 }
 
-void MSurface::copyFrom(MSurface *src, const Common::Rect &srcBounds, 
+void MSurface::copyFrom(MSurface *src, const Common::Rect &srcBounds,
 		const Common::Point &destPos, int transparentColor) {
-	// Validation of the rectangle and position	
-	int destX = destPos.x, destY = destPos.y;		
+	// Validation of the rectangle and position
+	int destX = destPos.x, destY = destPos.y;
 	if ((destX >= w) || (destY >= h))
 		return;
 
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index 7cf2bbe15b..060a7ab540 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -63,7 +63,7 @@ public:
 	/**
 	 * Helper method for calculating new dimensions when scaling a sprite
 	 */
-	static int scaleValue(int value, int scale, int err);	
+	static int scaleValue(int value, int scale, int err);
 public:
 	/**
 	 * Basic constructor
@@ -128,7 +128,7 @@ public:
 	 * Returns a pointer to the surface data
 	 */
 	byte *getData() { return (byte *)Graphics::Surface::getPixels(); }
-	
+
 	/**
 	 * Returns a pointer to a given position within the surface
 	 */
@@ -168,8 +168,8 @@ public:
 	/**
 	 * Copies the surface to a given destination surface
 	 */
-	void copyTo(MSurface *dest, int transparentColor = -1) { 
-		dest->copyFrom(this, Common::Rect(w, h), Common::Point(), transparentColor);		
+	void copyTo(MSurface *dest, int transparentColor = -1) {
+		dest->copyFrom(this, Common::Rect(w, h), Common::Point(), transparentColor);
 	}
 
 	/**
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index e6e3151472..4d34c76986 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -46,7 +46,7 @@ bool DialogsNebular::show(int messageId, int objectId) {
 	bool commandFlag = false;
 	bool crFlag = false;
 	TextDialog *dialog = nullptr;
-	_dialogWidth = 17; 
+	_dialogWidth = 17;
 	_capitalizationMode = kUppercase;
 
 	// Loop through the lines of the returned text
@@ -157,7 +157,7 @@ bool DialogsNebular::show(int messageId, int objectId) {
 
 	if (!centerFlag)
 		dialog->incNumLines();
-	
+
 	// Show the dialog
 	_vm->_events->setCursor(CURSOR_ARROW);
 	dialog->show();
@@ -218,7 +218,7 @@ bool DialogsNebular::textNoun(Common::String &dialogText, int nounNum,
 bool DialogsNebular::commandCheck(const char *idStr, Common::String &valStr,
 		const Common::String &command) {
 	uint idLen = strlen(idStr);
-	
+
 	valStr = (command.size() <= idLen) ? "" : Common::String(command.c_str() + idLen);
 
 	// Check whether the command starts with the given Id
@@ -334,8 +334,8 @@ bool CopyProtectionDialog::getHogAnusEntry(HOGANUS &entry) {
 
 /*------------------------------------------------------------------------*/
 
-PictureDialog::PictureDialog(MADSEngine *vm, const Common::Point &pos, 
-		int maxChars, int objectId) : 
+PictureDialog::PictureDialog(MADSEngine *vm, const Common::Point &pos,
+		int maxChars, int objectId) :
 		TextDialog(vm, FONT_INTERFACE, pos, maxChars), _objectId(objectId) {
 	Scene &scene = _vm->_game->_scene;
 	Palette &palette = *_vm->_palette;
@@ -406,7 +406,7 @@ ScreenDialog::DialogLine::DialogLine(const Common::String &s) {
 
 /*------------------------------------------------------------------------*/
 
-ScreenDialog::ScreenDialog(MADSEngine *vm) : _vm(vm), 
+ScreenDialog::ScreenDialog(MADSEngine *vm) : _vm(vm),
 		_savedSurface(MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT) {
 	Game &game = *_vm->_game;
 	Scene &scene = game._scene;
@@ -466,7 +466,7 @@ ScreenDialog::ScreenDialog(MADSEngine *vm) : _vm(vm),
 		MADS_SCREEN_WIDTH, _vm->_screen._offset.y + 157));
 	*/
 
-	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? 
+	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ?
 		kCenterVertTransition : kTransitionFadeIn;
 	game._trigger = 0;
 	_vm->_events->setCursor(CURSOR_ARROW);
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index 9a4fa97a57..86435c655f 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -45,7 +45,7 @@ ProtectionResult GameNebular::checkCopyProtection() {
 	/*
 	// DEBUG: Flag copy protection failure
 	_globals[kCopyProtectFailed] = -1;
-	
+
 	if (!ConfMan.getBool("copy_protection"))
 		return true;
 
@@ -398,7 +398,7 @@ void GameNebular::doObjectAction() {
 				error("TODO: object_get_folder - loc_29B48");
 				messageId = 860;
 			}
-			
+
 			if (id == OBJ_TAPE_PLAYER && _objects[OBJ_AUDIO_TAPE]._roomNumber == OBJ_TAPE_PLAYER)
 				messageId = 867;
 
diff --git a/engines/mads/nebular/globals_nebular.h b/engines/mads/nebular/globals_nebular.h
index 921c308346..fea90c515e 100644
--- a/engines/mads/nebular/globals_nebular.h
+++ b/engines/mads/nebular/globals_nebular.h
@@ -284,7 +284,7 @@ class NebularGlobals: public Globals {
 public:
 	SynchronizedList _spriteIndexes;
 	SynchronizedList _sequenceIndexes;
-	
+
 	int _timebombClock, _timebombTimer;
 public:
 	/**
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index ecc80c8ce3..c202fe1f80 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -124,7 +124,7 @@ void Scene101::sayDang() {
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[11], 17, 17);
 		_scene->_kernelMessages.add(Common::Point(143, 61), 0x1110, 0, 0, 60, _game.getQuote(57));
 		_scene->_sequences.addTimer(120, 73);
-		break; 
+		break;
 
 	case 73:
 		_vm->_dialogs->show(0x2785);
@@ -278,7 +278,7 @@ void Scene101::preActions() {
 		if (_game._player._needToWalk) {
 			switch (_game._trigger) {
 			case 0:
-				_game._player._needToWalk = false;	
+				_game._player._needToWalk = false;
 				_game._player._stepEnabled = false;
 				_scene->_sequences.remove(_globals._sequenceIndexes[11]);
 				_globals._sequenceIndexes[11] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[11], false, 3, 1, 0, 0);
@@ -1248,7 +1248,7 @@ void Scene103::enter() {
 	_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 0, 2, 0);
 	_scene->_sequences.setDepth(_globals._sequenceIndexes[1], 0);
 
-	_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 25);	
+	_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 6, 0, 0, 25);
 	_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 72);
 	_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 6, 0, 1, 37);
 	_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_SPRITE, 2, 73);
@@ -1267,7 +1267,7 @@ void Scene103::enter() {
 		_globals._sequenceIndexes[10] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[10], false, 6);
 	else
 		_vm->_game->_scene._hotspots.activate(289, false);
-	
+
 	if (_globals[kTurkeyExploded]) {
 		_globals._sequenceIndexes[9] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[9], false, 6);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[9], -2, -2);
@@ -1325,7 +1325,7 @@ void Scene103::step() {
 	default:
 		break;
 	}
-	
+
 	if (_scene->_frameStartTime >= _updateClock) {
 		pt = _vm->_game->_player._playerPos;
 		dist = _vm->hypotenuse(pt.x - 79, pt.y - 137);
@@ -1471,7 +1471,7 @@ void Scene103::actions() {
 			_sayHiToBinky = false;
 			break;
 		}
-			
+
 		case 2:
 			_scene->_kernelMessages.reset();
 			_scene->_sequences.addTimer(1, 3);
@@ -1868,25 +1868,25 @@ void Scene105::actions() {
 			_vm->_dialogs->showItem(OBJ_DEAD_FISH, 802, 0);
 		}
 	} else if (_action.isAction(VERB_LOOK, 0x195))
-		_vm->_dialogs->show(0x2905); 
+		_vm->_dialogs->show(0x2905);
 	else if (_action.isAction(VERB_LOOK, 0x4D))
-		_vm->_dialogs->show(0x2906); 
+		_vm->_dialogs->show(0x2906);
 	else if (_action.isAction(VERB_LOOK, 0xF0))
-		_vm->_dialogs->show(0x2907); 
+		_vm->_dialogs->show(0x2907);
 	else if (_action.isAction(VERB_LOOK, 0xDD))
-		_vm->_dialogs->show(0x2908); 
+		_vm->_dialogs->show(0x2908);
 	else if (_action.isAction(VERB_TAKE, 0xDD))
-		_vm->_dialogs->show(0x2909); 
+		_vm->_dialogs->show(0x2909);
 	else if (_action.isAction(VERB_LOOK, 0xE0))
-		_vm->_dialogs->show(0x290A); 
+		_vm->_dialogs->show(0x290A);
 	else if (_action.isAction(VERB_LOOK, 0x65))
-		_vm->_dialogs->show(0x290C); 
+		_vm->_dialogs->show(0x290C);
 	else if (_action.isAction(VERB_LOOK, 0x158))
-		_vm->_dialogs->show(0x290D); 
+		_vm->_dialogs->show(0x290D);
 	else if (_action.isAction(VERB_LOOK, 0xF5))
-		_vm->_dialogs->show(0x290E); 
+		_vm->_dialogs->show(0x290E);
 	else if (_action.isAction(VERB_LOOK, 0x129))
-		_vm->_dialogs->show(0x290F); 
+		_vm->_dialogs->show(0x290F);
 	else
 		return;
 
@@ -2289,7 +2289,7 @@ void Scene108::actions() {
 			_scene->_sequences.remove(_globals._sequenceIndexes[4]);
 			_game._objects.addToInventory(OBJ_DEAD_FISH);
 			_globals[kFishIn108] = false;
-			_vm->_dialogs->showItem(OBJ_DEAD_FISH, 10808); 
+			_vm->_dialogs->showItem(OBJ_DEAD_FISH, 10808);
 		}
 	} else if (_action.isAction(0x15D, 0xF4))
 		_scene->_nextSceneId = 107;
@@ -2618,7 +2618,7 @@ void Scene109::actions() {
 									threshold = 50;
 									break;
 								}
-								
+
 								if (_globals[kHoovicFishEaten] >= threshold) {
 									int randVal = _vm->getRandomNumber(83, 84);
 									_scene->_kernelMessages.add(Common::Point(230, 24), 0xFDFC, 0, 0, 120, _game.getQuote(randVal));
@@ -2690,28 +2690,28 @@ void Scene109::actions() {
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
 		_game._objects.addToInventory(OBJ_BURGER);
 	} else if (_action.isAction(VERB_LOOK, 0xF0))
-		_vm->_dialogs->show(0x2A95); 
+		_vm->_dialogs->show(0x2A95);
 	else if (_action.isAction(VERB_LOOK, 0x5A))
-		_vm->_dialogs->show(0x2A96); 
+		_vm->_dialogs->show(0x2A96);
 	else if ((_action.isAction(VERB_TAKE) || _action.isAction(VERB_PULL)) && _action.isAction(0x5A))
-		_vm->_dialogs->show(0x2A97); 
+		_vm->_dialogs->show(0x2A97);
 	else if (_action.isAction(VERB_LOOK, 0x129))
-		_vm->_dialogs->show(0x2A98); 
+		_vm->_dialogs->show(0x2A98);
 	else if (_action.isAction(VERB_TAKE, 0x129))
-		_vm->_dialogs->show(0x2A99); 
+		_vm->_dialogs->show(0x2A99);
 	else if (_action.isAction(VERB_LOOK, 0x45))
-		_vm->_dialogs->show(0x2A9A); 
+		_vm->_dialogs->show(0x2A9A);
 	else if (_action.isAction(VERB_LOOK, 0x178)) {
 		if (_globals[kHoovicAlive])
-			_vm->_dialogs->show(0x2A9B); 
+			_vm->_dialogs->show(0x2A9B);
 		else
 			_vm->_dialogs->show(0x2AA1);
 	} else if (_action.isAction(VERB_LOOK, 0x146))
-		_vm->_dialogs->show(0x2A9C); 
+		_vm->_dialogs->show(0x2A9C);
 	else if (_action.isAction(VERB_LOOK, 0xFC))
-		_vm->_dialogs->show(0x2A9F); 
+		_vm->_dialogs->show(0x2A9F);
 	else if (_action.isAction(VERB_PUT, 0x146))
-		_vm->_dialogs->show(0x2A9E); 
+		_vm->_dialogs->show(0x2A9E);
 	else if (_action.isAction(VERB_LOOK, 0x66))
 		_vm->_dialogs->show(0x2AA2);
 	else
@@ -2835,19 +2835,19 @@ void Scene110::actions() {
 	} else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, 0x3F))
 		_vm->_dialogs->show(0x2AF9);
 	else if (_action.isAction(VERB_LOOK, 0x40) || _action.isAction(0xD1, 0x40))
-		_vm->_dialogs->show(0x2AFA); 
+		_vm->_dialogs->show(0x2AFA);
 	else if (_action.isAction(VERB_LOOK, 0x129))
-		_vm->_dialogs->show(0x2AFB); 
+		_vm->_dialogs->show(0x2AFB);
 	else if (_action.isAction(VERB_TAKE, 0x129))
-		_vm->_dialogs->show(0x2AFC); 
+		_vm->_dialogs->show(0x2AFC);
 	else if (_action.isAction(VERB_LOOK, 0x178))
-		_vm->_dialogs->show(0x2AFD); 
+		_vm->_dialogs->show(0x2AFD);
 	else if (_action.isAction(VERB_LOOK, 0x41))
-		_vm->_dialogs->show(0x2AFE); 
+		_vm->_dialogs->show(0x2AFE);
 	else if (_action.isAction(VERB_LOOK, 0x8F))
-		_vm->_dialogs->show(0x2AFF); 
+		_vm->_dialogs->show(0x2AFF);
 	else if (_action.isAction(VERB_TAKE, 0x8F))
-		_vm->_dialogs->show(0x2B00); 
+		_vm->_dialogs->show(0x2B00);
 	else
 		return;
 
diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h
index 38caf1560e..80df7f9e4d 100644
--- a/engines/mads/nebular/nebular_scenes1.h
+++ b/engines/mads/nebular/nebular_scenes1.h
@@ -66,7 +66,7 @@ private:
 
 	void sayDang();
 public:
-	Scene101(MADSEngine *vm) : Scene1xx(vm), _sittingFl(false), _panelOpened(false), _messageNum(0), 
+	Scene101(MADSEngine *vm) : Scene1xx(vm), _sittingFl(false), _panelOpened(false), _messageNum(0),
 		_posY(0), _shieldSpriteIdx(0), _chairHotspotId(0), _oldSpecial(0) {}
 
 	virtual void setup();
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 44deeba77e..78421e6c04 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1139,9 +1139,9 @@ void Scene307::actions() {
 
 void Scene307::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
-	
+
 	_forceField.synchronize(s);
-	
+
 	s.syncAsByte(_afterPeeingFl);
 	s.syncAsByte(_duringPeeingFl);
 	s.syncAsByte(_grateOpenedFl);
@@ -1286,7 +1286,7 @@ void Scene308::step() {
 
 void Scene308::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
-	
+
 	_forceField.synchronize(s);
 }
 
@@ -1477,7 +1477,7 @@ void Scene309::step() {
 
 void Scene309::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
-	
+
 	_forceField.synchronize(s);
 
 	for (int i = 0; i < 3; ++i)
@@ -1522,7 +1522,7 @@ void Scene310::step() {
 
 void Scene310::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
-	
+
 	_forceField.synchronize(s);
 }
 
@@ -1817,7 +1817,7 @@ void Scene311::actions() {
 
 void Scene311::synchronize(Common::Serializer &s) {
 	Scene3xx::synchronize(s);
-	
+
 	s.syncAsByte(_checkGuardFl);
 }
 
@@ -3438,7 +3438,7 @@ void Scene319::synchronize(Common::Serializer &s) {
 	s.syncAsByte(_slacheTalkingFl);
 	s.syncAsByte(_slacheReady);
 	s.syncAsByte(_slacheInitFl);
-	
+
 	s.syncString(_subQuote2);
 }
 
diff --git a/engines/mads/nebular/nebular_scenes3.h b/engines/mads/nebular/nebular_scenes3.h
index f6d1ab5851..b42238ddb4 100644
--- a/engines/mads/nebular/nebular_scenes3.h
+++ b/engines/mads/nebular/nebular_scenes3.h
@@ -181,7 +181,7 @@ private:
 	int _characterSpriteIndexes[3];
 	int _messagesIndexes[3];
 	int _lastFrame;
-	
+
 public:
 	Scene309(MADSEngine *vm) : Scene3xx(vm) {}
 
diff --git a/engines/mads/nebular/nebular_scenes4.h b/engines/mads/nebular/nebular_scenes4.h
index f2e8961089..8ff2ec59f8 100644
--- a/engines/mads/nebular/nebular_scenes4.h
+++ b/engines/mads/nebular/nebular_scenes4.h
@@ -110,14 +110,14 @@ private:
 	Conversation _dialog2;
 	Conversation _dialog3;
 	Conversation _dialog4;
- 
+
 	void setDialogNode(int node);
 	void handleConversation1();
 	void handleConversation2();
 	void handleConversation3();
 	void handleConversation4();
 	void handleDialogs();
-	
+
 public:
 	Scene402(MADSEngine *vm) : Scene4xx(vm) {}
 	void synchronize(Common::Serializer &s);
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 4ae2925c72..42ec3f1b02 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -226,7 +226,7 @@ void Scene707::enter() {
 	// The original uses Scene7xx_sceneEntrySound
 	if (!_vm->_musicFlag)
 		_vm->_sound->command(2);
-	else 
+	else
 		_vm->_sound->command(25);
 }
 
@@ -337,7 +337,7 @@ void Scene711::enter() {
 	// The original was using Scene7xx_SceneEntrySound()
 	if (!_vm->_musicFlag)
 		_vm->_sound->command(2);
-	else 
+	else
 		_vm->_sound->command(25);
 }
 
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 1ae10ed72b..0be53ef41d 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -167,7 +167,7 @@ void Scene804::step() {
 		switch (_game._storyMode) {
 		case STORYMODE_NAUGHTY:
 			if (_scene->_activeAnimation->getCurrentFrame() == 81) {
-				_resetFrame = 80; 
+				_resetFrame = 80;
 				_globals[kInSpace] = false;
 				_globals[kBeamIsUp] = true;
 
@@ -177,7 +177,7 @@ void Scene804::step() {
 			}
 			break;
 
-		case STORYMODE_NICE:			 
+		case STORYMODE_NICE:
 			if (_scene->_activeAnimation->getCurrentFrame() == 68) {
 				_resetFrame = 66;
 				_globals[kInSpace] = false;
@@ -240,10 +240,10 @@ void Scene804::step() {
 		case 26:
 		case 28:
 		case 31:
-			_resetFrame = 0; 
+			_resetFrame = 0;
 			break;
 		}
-	} else {   
+	} else {
 		if ((_scene->_activeAnimation->getCurrentFrame() == 36) && (!_throttleGone)) {
 			_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 			_throttleGone = true;
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 5f1d80513e..de6846bb17 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -74,7 +74,7 @@ void AdlibChannel::enable(int flag) {
 		// WORKAROUND: Original set _soundData pointer to flag. Since this seems
 		// just intended to invalidate any prior pointer, I've replaced it with
 		// a simple null pointer
-		_soundData = nullptr; 
+		_soundData = nullptr;
 	}
 }
 
@@ -185,7 +185,7 @@ ASound::ASound(Audio::Mixer *mixer, const Common::String &filename, int dataOffs
 	assert(_opl);
 
 	_opl->init(getRate());
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, 
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1,
 		Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 
 	// Initialise the Adlib
@@ -213,7 +213,7 @@ void ASound::adlibInit() {
 	write(4, 0x80);
 }
 
-int ASound::stop() { 
+int ASound::stop() {
 	command0();
 	int result = _pollResult;
 	_pollResult = 0;
@@ -238,7 +238,7 @@ void ASound::noise() {
 	}
 
 	if (_v2) {
-		setFrequency(_channelNum2, (randomVal & _freqMask2) + _freqBase2);		
+		setFrequency(_channelNum2, (randomVal & _freqMask2) + _freqBase2);
 	}
 }
 
@@ -278,7 +278,7 @@ void ASound::resultCheck() {
 }
 
 byte *ASound::loadData(int offset, int size) {
-	// First scan for an existing copy	
+	// First scan for an existing copy
 	Common::List<CachedDataEntry>::iterator i;
 	for (i = _dataCache.begin(); i != _dataCache.end(); ++i) {
 		CachedDataEntry &e = *i;
@@ -392,7 +392,7 @@ void ASound::checkChannels() {
 }
 
 void ASound::pollActiveChannel() {
-	AdlibChannel *chan = _activeChannelPtr; 
+	AdlibChannel *chan = _activeChannelPtr;
 	bool updateFlag = true;
 
 	if (chan->_activeCount) {
@@ -572,7 +572,7 @@ void ASound::pollActiveChannel() {
 						chan->_field1F = *++pSrc;
 						chan->_pSrc += 2;
 						break;
-					
+
 					default:
 						break;
 					}
@@ -624,7 +624,7 @@ void ASound::updateOctave() {
 }
 
 static int _vList1[] = {
-	0x200, 0x21E, 0x23F, 0x261, 0x285, 0x2AB, 
+	0x200, 0x21E, 0x23F, 0x261, 0x285, 0x2AB,
 	0x2D4, 0x2FF, 0x32D, 0x35D, 0x390, 0x3C7
 };
 
@@ -688,7 +688,7 @@ static const int volumeList[] = {
 	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04,
 	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
 	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
@@ -696,7 +696,7 @@ void ASound::updateActiveChannel() {
 	int reg = 0x40 + outputChannels[outputIndexes[_activeChannelNumber * 2]];
 	int portVal = _ports[reg] & 0xFFC0;
 	int newVolume = CLIP(_activeChannelPtr->_volume + _activeChannelPtr->_field1E, 0, 63);
-	
+
 	// Note: Original had a whole block not seeming to be used, since the initialisation
 	// sets a variable to 5660h, and doesn't change it, so the branch is never taken
 	int val = CLIP(newVolume - volumeList[_activeChannelPtr->_fieldD], 0, 63);
@@ -756,7 +756,7 @@ void ASound::processSample() {
 
 	// Write out waveform select
 	write2(8, 0xE0 + _v11, _samplePtr->_waveformSelect & 3);
-	
+
 	// Write out total level & scaling level
 	val = -((_samplePtr->_totalLevel & 0x3F) - 0x3F) | (_samplePtr->_scalingLevel << 6);
 	write2(8, 0x40 + _v11, val);
@@ -813,7 +813,7 @@ int ASound::command0() {
 	_freqMask1 = _freqMask2 = 0;
 	_freqBase1 = _freqBase2 = 0;
 	_v7 = 0;
-	_v8 = 0;	
+	_v8 = 0;
 
 	// Reset Adlib port registers
 	for (int reg = 0x4F; reg >= 0x40; --reg)
@@ -907,21 +907,21 @@ int ASound::command8() {
 
 const ASound1::CommandPtr ASound1::_commandList[42] = {
 	&ASound1::command0, &ASound1::command1, &ASound1::command2, &ASound1::command3,
-	&ASound1::command4, &ASound1::command5, &ASound1::command6, &ASound1::command7, 
+	&ASound1::command4, &ASound1::command5, &ASound1::command6, &ASound1::command7,
 	&ASound1::command8, &ASound1::command9, &ASound1::command10, &ASound1::command11,
 	&ASound1::command12, &ASound1::command13, &ASound1::command14, &ASound1::command15,
-	&ASound1::command16, &ASound1::command17, &ASound1::command18, &ASound1::command19, 
-	&ASound1::command20, &ASound1::command21, &ASound1::command22, &ASound1::command23, 
+	&ASound1::command16, &ASound1::command17, &ASound1::command18, &ASound1::command19,
+	&ASound1::command20, &ASound1::command21, &ASound1::command22, &ASound1::command23,
 	&ASound1::command24, &ASound1::command25, &ASound1::command26, &ASound1::command27,
-	&ASound1::command28, &ASound1::command29, &ASound1::command30, &ASound1::command31, 
+	&ASound1::command28, &ASound1::command29, &ASound1::command30, &ASound1::command31,
 	&ASound1::command32, &ASound1::command33, &ASound1::command34, &ASound1::command35,
-	&ASound1::command36, &ASound1::command37, &ASound1::command38, &ASound1::command39, 
+	&ASound1::command36, &ASound1::command37, &ASound1::command38, &ASound1::command39,
 	&ASound1::command40, &ASound1::command41
 };
 
 ASound1::ASound1(Audio::Mixer *mixer): ASound(mixer, "asound.001", 0x1520) {
 	_cmd23Toggle = false;
-	
+
 	// Load sound samples
 	_soundFile.seek(_dataOffset + 0x12C);
 	for (int i = 0; i < 98; ++i)
@@ -1134,7 +1134,7 @@ int ASound1::command33() {
 
 int ASound1::command34() {
 	int v = getRandomNumber() & 0x20;
-	if (!v) 
+	if (!v)
 		v = 0x60;
 
 	byte *pData = loadData(0xDD0, 22);
diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h
index caafdcaf77..44e108fd04 100644
--- a/engines/mads/nebular/sound_nebular.h
+++ b/engines/mads/nebular/sound_nebular.h
@@ -167,7 +167,7 @@ private:
 
 	void updateChannelState();
 	void updateActiveChannel();
-	
+
 	/**
 	 * Loads up the specified sample
 	 */
@@ -339,12 +339,12 @@ public:
 	 * Main buffer read
 	 */
 	virtual int readBuffer(int16 *buffer, const int numSamples);
-	
+
 	/**
 	 * Mono sound only
 	 */
 	virtual bool isStereo() const { return false; }
-	
+
 	/**
 	 * Data is continuously pushed, so definitive end
 	 */
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 6beaad9787..6be9d3dc30 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -72,7 +72,7 @@ void PaletteUsage::prioritize(Common::Array<RGB6> &palette) {
 		RGB6 &palEntry = palette[(*_data)[i]._palIndex];
 		(*_data)[i]._sortValue = _vm->_palette->rgbMerge(palEntry);
 	}
-	
+
 	Common::sort(_data->begin(), _data->end(), sortHelper);
 }
 
@@ -139,7 +139,7 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 	}
 
 	Common::sort(palRange.begin(), palRange.end(), rangeSorter);
-	
+
 	int var3A = (flags & 0x4000) ? 0xffff : 0xfffe;
 
 	for (uint palIndex = 0; palIndex < palette.size(); ++palIndex) {
@@ -183,7 +183,7 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 				(((flags & 0x2000) || (palette[palIndex]._flags & 0x4000)) &&
 				((flags & 0x1000) || (palCount == 0))) ? 0x7fff : 1;
 			int var36 = (palette[palIndex]._flags & 0x80) ? 0 : 2;
-			
+
 			for (int idx = palLow; idx < palIdx; ++idx) {
 				uint32 v = _vm->_palette->_palFlags[idx];
 				if ((v & var3A) && !(v & var36)) {
@@ -225,7 +225,7 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 				}
 			}
 		}
-		
+
 		assert(var48);
 		int var52 = (noUsageFlag && palette[palIndex]._u2) ? 2 : 0;
 
@@ -430,7 +430,7 @@ void Fader::mapToGreyRamp(byte palette[PALETTE_SIZE], int baseColor, int numColo
 	for (int idx = 0; idx < PALETTE_COUNT; ++idx) {
 		map[idx]._mapColor = (byte)idx;
 	}
-	
+
 	// Sort the mapping list
 	Common::sort(&greyList[0], &greyList[numColors], greyCompareFunc);
 
@@ -486,7 +486,7 @@ void Fader::mapToGreyRamp(byte palette[PALETTE_SIZE], int baseColor, int numColo
 	}
 }
 
-void Fader::getGreyValues(const byte palette[PALETTE_SIZE], 
+void Fader::getGreyValues(const byte palette[PALETTE_SIZE],
 		GreyTableEntry greyList[PALETTE_COUNT], int baseColor, int numColors) {
 	const byte *palP = &palette[baseColor * 3];
 
@@ -496,7 +496,7 @@ void Fader::getGreyValues(const byte palette[PALETTE_SIZE],
 	}
 }
 
-void Fader::greyPopularity(const GreyTableEntry greyList[PALETTE_COUNT], 
+void Fader::greyPopularity(const GreyTableEntry greyList[PALETTE_COUNT],
 		byte greyTable[64], int numColors) {
 	Common::fill(&greyTable[0], &greyTable[64], 0);
 	for (int i = 0; i < numColors; ++i) {
@@ -590,7 +590,7 @@ void Palette::setSystemPalette() {
 	palData[1 * 3] = palData[1 * 3 + 1] = palData[1 * 3 + 2] = 0x54;
 	palData[2 * 3] = palData[2 * 3 + 1] = palData[2 * 3 + 2] = 0xb4;
 	palData[3 * 3] = palData[3 * 3 + 1] = palData[3 * 3 + 2] = 0xff;
-	
+
 	setPalette(palData, 0, 4);
 }
 
@@ -624,11 +624,11 @@ void Palette::initPalette() {
 		for (int idx = 0; idx < _vm->_game->_player._numSprites; ++idx) {
 			SpriteAsset *asset = _vm->_game->_scene._sprites[
 				_vm->_game->_player._spritesStart + idx];
-			
+
 			uint32 mask = 1;
 			if (asset->_usageIndex)
 				mask <<= asset->_usageIndex;
-			
+
 			palMask = mask;
 		}
 	}
diff --git a/engines/mads/palette.h b/engines/mads/palette.h
index 9bf5bfa830..31c3d1a90f 100644
--- a/engines/mads/palette.h
+++ b/engines/mads/palette.h
@@ -42,13 +42,13 @@ class MADSEngine;
  * Palette mapping options
  */
 enum {
-	PALFLAG_BACKGROUND		= 0x8000,  // Loading initial background       
-	PALFLAG_RESERVED		= 0x4000,  // Enable mapping reserved colors 
-	PALFLAG_ANY_TO_CLOSEST	= 0x2000,  // Any color can map to closest     
-	PALFLAG_ALL_TO_CLOSEST	= 0x1000,  // Any colors that can map must map 
-	PALFLAG_TOP_COLORS		= 0x0800,  // Allow mapping to high four colors 
-	PALFLAG_DEFINE_RESERVED	= 0x0400,  // Define initial reserved color    
-	PALFLAG_MASK			= 0xfc00   // Mask for all the palette flags   
+	PALFLAG_BACKGROUND		= 0x8000,  // Loading initial background
+	PALFLAG_RESERVED		= 0x4000,  // Enable mapping reserved colors
+	PALFLAG_ANY_TO_CLOSEST	= 0x2000,  // Any color can map to closest
+	PALFLAG_ALL_TO_CLOSEST	= 0x1000,  // Any colors that can map must map
+	PALFLAG_TOP_COLORS		= 0x0800,  // Allow mapping to high four colors
+	PALFLAG_DEFINE_RESERVED	= 0x0400,  // Define initial reserved color
+	PALFLAG_MASK			= 0xfc00   // Mask for all the palette flags
 };
 
 struct PaletteCycle {
@@ -182,7 +182,7 @@ private:
 
 	/**
 	 * Given a grey value list containing grey shades (0-63), creates a 64 byte
-	 * grey table containing the number of grey values for each intensity 
+	 * grey table containing the number of grey values for each intensity
 	 */
 	void greyPopularity(const GreyTableEntry greyList[PALETTE_COUNT], byte greyTable[64], int numColors);
 protected:
@@ -259,7 +259,7 @@ public:
 	 * Constructor
 	 */
 	Palette(MADSEngine *vm);
-	
+
 	/**
 	 * Destructor
 	 */
diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index 25da7771c5..5232322c73 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -44,7 +44,7 @@ ProtectionResult GamePhantom::checkCopyProtection() {
 	/*
 	// DEBUG: Flag copy protection failure
 	_globals[5] = -1;
-	
+
 	if (!ConfMan.getBool("copy_protection"))
 		return true;
 
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index aea73bbbec..96e2cd6ea1 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -71,7 +71,7 @@ Player::Player(MADSEngine *vm): _vm(vm) {
 	_frameListIndex = 0;
 	_stopWalkerIndex = 0;
 	_totalDistance = 0;
-	
+
 	Common::fill(&_stopWalkerList[0], &_stopWalkerList[12], 0);
 	Common::fill(&_stopWalkerTrigger[0], &_stopWalkerTrigger[12], 0);
 	Common::fill(&_spriteSetsPresent[0], &_spriteSetsPresent[PLAYER_SPRITES_FILE_COUNT], false);
@@ -273,7 +273,7 @@ void Player::update() {
 
 		int newDepth = 1;
 		int yp = MIN(_playerPos.y, (int16)(MADS_SCENE_HEIGHT - 1));
-		
+
 		for (int idx = 1; idx < 15; ++idx) {
 			if (scene._sceneInfo->_depthList[newDepth] >= yp)
 				newDepth = idx + 1;
@@ -299,11 +299,11 @@ void Player::update() {
 			if (slotIndex >= 0) {
 				// Check if the existing player slot has the same details, and can be re-used
 				SpriteSlot &s2 = scene._spriteSlots[slotIndex];
-				bool equal = (s2._seqIndex == slot._seqIndex) 
+				bool equal = (s2._seqIndex == slot._seqIndex)
 					&& (s2._spritesIndex == slot._spritesIndex)
-					&& (s2._frameNumber == slot._frameNumber) 
+					&& (s2._frameNumber == slot._frameNumber)
 					&& (s2._position == slot._position)
-					&& (s2._depth == slot._depth) 
+					&& (s2._depth == slot._depth)
 					&& (s2._scale == slot._scale);
 
 				if (equal)
@@ -319,7 +319,7 @@ void Player::update() {
 				scene._spriteSlots[slotIndex] = slot;
 			}
 
-			// If changing a scene, check to change the scene when the player 
+			// If changing a scene, check to change the scene when the player
 			// has moved off-screen
 			if (_walkOffScreen) {
 				SpriteAsset *asset = scene._sprites[slot._spritesIndex];
@@ -545,7 +545,7 @@ int Player::getSpriteSlot() {
 	SpriteSlots &spriteSlots = _vm->_game->_scene._spriteSlots;
 
 	for (uint idx = 0; idx < spriteSlots.size(); ++idx) {
-		if (spriteSlots[idx]._seqIndex == PLAYER_SEQ_INDEX && 
+		if (spriteSlots[idx]._seqIndex == PLAYER_SEQ_INDEX &&
 				spriteSlots[idx]._flags >= IMG_STATIC)
 			return idx;
 	}
diff --git a/engines/mads/rails.cpp b/engines/mads/rails.cpp
index 00f7f4cdbc..6beee5a242 100644
--- a/engines/mads/rails.cpp
+++ b/engines/mads/rails.cpp
@@ -101,7 +101,7 @@ void Rails::setupRouteNode(int *routeIndexP, int nodeIndex, int flags, int route
 	int subIndex = _nodes.size() - 2;
 
 	int distanceVal = _nodes[nodeIndex]._distances[subIndex];
-	if (distanceVal & flags) {                                                                                                                                                   
+	if (distanceVal & flags) {
 		routeLength += distanceVal & 0x3FFF;
 		if (routeLength < _routeLength) {
 			// Found a new shorter route to destination, so set up the route with the found one
@@ -266,7 +266,7 @@ int Rails::getRouteFlags(const Common::Point &src, const Common::Point &dest) {
 void Rails::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_routeLength);
 	s.syncAsSint16LE(_next);
-	
+
 	int count = _routeIndexes.size();
 	if (s.isSaving()) {
 		for (int i = 0; i < count; ++i)
diff --git a/engines/mads/rails.h b/engines/mads/rails.h
index 4014491e25..e6cab08f85 100644
--- a/engines/mads/rails.h
+++ b/engines/mads/rails.h
@@ -51,7 +51,7 @@ public:
 typedef Common::Array<WalkNode> WalkNodeList;
 
 /**
- * This class handles storing the intermediate walk node points for a 
+ * This class handles storing the intermediate walk node points for a
  * given scene, and calculating walking routes between any two positions.
  */
 class Rails {
diff --git a/engines/mads/resources.cpp b/engines/mads/resources.cpp
index f0609448bb..4f5596dea6 100644
--- a/engines/mads/resources.cpp
+++ b/engines/mads/resources.cpp
@@ -169,10 +169,10 @@ void HagArchive::loadIndex(MADSEngine *vm) {
 			Common::String::format("SECTION%d.HAG", sectionIndex);
 		if (!hagFile.open(filename))
 			error("Could not locate HAG file - %s", filename.c_str());
-	
+
 		// Check for header
 		char headerBuffer[16];
-		if ((hagFile.read(headerBuffer, 16) != 16) || 
+		if ((hagFile.read(headerBuffer, 16) != 16) ||
 				(strncmp(headerBuffer, MADSCONCAT_STRING, 10) != 0))
 			error("Invalid HAG file opened");
 
@@ -269,7 +269,7 @@ ResourceType HagArchive::getResourceType(const Common::String &resourceName) con
 	} else if (resourceName.hasPrefix("SPCHC")) {
 		// SPEECH resource
 		return RESTYPE_SPEECH;
-	} 
+	}
 
 	// Check for a known extension
 	const char *extPos = strchr(resourceName.c_str(), '.');
@@ -360,7 +360,7 @@ Common::String Resources::formatName(int prefix, char asciiCh, int id, EXTTYPE e
 	return result;
 }
 
-Common::String Resources::formatResource(const Common::String &resName, 
+Common::String Resources::formatResource(const Common::String &resName,
 		const Common::String &hagFilename) {
 //	int v1 = 0, v2 = 0;
 
diff --git a/engines/mads/resources.h b/engines/mads/resources.h
index 7d56138da5..137eb7a169 100644
--- a/engines/mads/resources.h
+++ b/engines/mads/resources.h
@@ -37,7 +37,7 @@ enum RESPREFIX {
 };
 
 enum EXTTYPE {
-	EXT_NONE = -1, EXT_SS = 1, EXT_AA = 2, EXT_DAT = 3, EXT_HH = 4, 
+	EXT_NONE = -1, EXT_SS = 1, EXT_AA = 2, EXT_DAT = 3, EXT_HH = 4,
 	EXT_ART = 5, EXT_INT = 6
 };
 
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 609e2335e4..32956e6484 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -32,7 +32,7 @@ namespace MADS {
 
 Scene::Scene(MADSEngine *vm): _vm(vm), _action(_vm), _depthSurface(vm),
 		_dirtyAreas(_vm),  _dynamicHotspots(vm), _hotspots(vm),
-		_kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm), 
+		_kernelMessages(vm), _sequences(vm), _sprites(vm), _spriteSlots(vm),
 		_textDisplay(vm), _userInterface(vm) {
 	_priorSceneId = 0;
 	_nextSceneId = 0;
@@ -169,11 +169,11 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
 		flags |= ANIMFLAG_DITHER;
 	if (_vm->_textWindowStill)
 		flags |= ANIMFLAG_LOAD_BACKGROUND_ONLY;
-		
+
 	_animationData = Animation::init(_vm, this);
 	MSurface depthSurface;
 	_animationData->load(_userInterface, depthSurface, prefix, flags, nullptr, nullptr);
-	
+
 	_vm->_palette->_paletteUsage.load(&_scenePaletteUsage);
 
 	_bandsRange = _sceneInfo->_yBandsEnd - _sceneInfo->_yBandsStart;
@@ -184,7 +184,7 @@ void Scene::loadScene(int sceneId, const Common::String &prefix, bool palFlag) {
 	_spritesCount = _sprites.size();
 
 	_userInterface.setup(_vm->_game->_screenObjects._inputMode);
-	
+
 	_vm->_game->_screenObjects._category = CAT_NONE;
 	_vm->_events->showCursor();
 
@@ -386,7 +386,7 @@ void Scene::doFrame() {
 		_frameStartTime = _vm->_events->getFrameCounter();
 
 	// Handle parser actions as well as game triggers
-	if ((_action._inProgress && !player._moving && !player._needToWalk && 
+	if ((_action._inProgress && !player._moving && !player._needToWalk &&
 			(player._facing == player._turnToFacing) && !_vm->_game->_trigger) ||
 			(_vm->_game->_trigger && (_vm->_game->_triggerMode == SEQUENCE_TRIGGER_PARSER))) {
 		doAction();
@@ -420,7 +420,7 @@ void Scene::doFrame() {
 			if (_vm->_debugger->_showMousePos) {
 				Common::Point pt = _vm->_events->mousePos();
 				Common::String msg = Common::String::format("(%d,%d)", pt.x, pt.y);
-				mouseTextIndex = _kernelMessages.add(Common::Point(5, 5), 
+				mouseTextIndex = _kernelMessages.add(Common::Point(5, 5),
 					0x203, 0, 0, 1, msg);
 			}
 
@@ -504,7 +504,7 @@ void  Scene::drawElements(ScreenTransition transitionType, bool surfaceFlag) {
 }
 
 void Scene::doPreactions() {
-	if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences || 
+	if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences ||
 			_vm->_game->_screenObjects._inputMode == kInputLimitedSentences) {
 		_vm->_game->_triggerSetupMode = SEQUENCE_TRIGGER_PREPARE;
 		_action.checkAction();
@@ -533,7 +533,7 @@ void Scene::doAction() {
 			flag = !_action._inProgress;
 		}
 
-		if ((_action._inProgress || _vm->_game->_trigger) && 
+		if ((_action._inProgress || _vm->_game->_trigger) &&
 				(!flag || _action._savedFields._commandError == flag)) {
 			_vm->_game->doObjectAction();
 		}
@@ -589,7 +589,7 @@ void Scene::loadAnimation(const Common::String &resName, int trigger) {
 	UserInterface interfaceSurface(_vm);
 
 	_activeAnimation = Animation::init(_vm, this);
-	_activeAnimation->load(interfaceSurface, depthSurface, resName, 
+	_activeAnimation->load(interfaceSurface, depthSurface, resName,
 		_vm->_dithering ? ANIMFLAG_DITHER : 0, nullptr, nullptr);
 	_activeAnimation->startAnimation(trigger);
 }
diff --git a/engines/mads/scene.h b/engines/mads/scene.h
index 3661bd6502..69a2c0d78d 100644
--- a/engines/mads/scene.h
+++ b/engines/mads/scene.h
@@ -224,7 +224,7 @@ public:
 	void resetScene();
 
 	/**
-	* Removes all the scene specific sprites fromt the sprites list, 
+	* Removes all the scene specific sprites fromt the sprites list,
 	* leaving any player sprites list in place at the start of the list.
 	*/
 	void removeSprites();
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index 272c8288f0..256a517540 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -112,7 +112,7 @@ SceneInfo *SceneInfo::init(MADSEngine *vm) {
 void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		int flags, MSurface &depthSurface, MSurface &bgSurface) {
 	bool sceneFlag = sceneId >= 0;
-	
+
 	// Figure out the resource to use
 	Common::String resourceName;
 	if (sceneFlag) {
@@ -133,7 +133,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		infoStream->skip(6);	// actual scene ID (string)
 		_sceneId = sceneId;
 	}
-	
+
 	// TODO: The following isn't quite right for V2 games (it's all 0)
 	_artFileNum = infoStream->readUint16LE();
 	_depthStyle = infoStream->readUint16LE();
@@ -161,7 +161,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 	for (int i = 0; i < 20; ++i) {
 		WalkNode node;
 		node.load(infoStream);
-		
+
 		if (i < nodeCount)
 			_nodes.push_back(node);
 	}
@@ -169,7 +169,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 	int spriteSetsCount  = infoStream->readUint16LE();
 	int spriteInfoCount = infoStream->readUint16LE();
 
-	// Load in sprite sets 
+	// Load in sprite sets
 	Common::StringArray setNames;
 	for (int i = 0; i < 10; ++i) {
 		char name[64];
@@ -236,7 +236,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 
 			SpriteAsset *sprites = new SpriteAsset(_vm, setResName, flags);
 			spriteSets.push_back(sprites);
-			usageList.push_back(sprites->_usageIndex); 
+			usageList.push_back(sprites->_usageIndex);
 		}
 	}
 
@@ -248,7 +248,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
 		assert(asset && _depthStyle != 2);
 
 		MSprite *spr = asset->getFrame(asset->getCount() - 1);
-		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface, si._scale, 
+		bgSurface.copyFrom(spr, si._position, si._depth, &depthSurface, si._scale,
 			spr->getTransparencyIndex());
 	}
 
@@ -292,7 +292,7 @@ void SceneInfo::loadPalette(int sceneId, int artFileNum, const Common::String &r
 			_vm->_palette->_paletteUsage.prioritize(artHeader._palette);
 		}
 
-		_usageIndex = _vm->_palette->_paletteUsage.process(artHeader._palette, 
+		_usageIndex = _vm->_palette->_paletteUsage.process(artHeader._palette,
 			(flags & 0xF800) | 0x8000);
 		if (_usageIndex > 0) {
 			_vm->_palette->_paletteUsage.transform(artHeader._palette);
diff --git a/engines/mads/scene_data.h b/engines/mads/scene_data.h
index c295ae0de8..83caec5682 100644
--- a/engines/mads/scene_data.h
+++ b/engines/mads/scene_data.h
@@ -53,7 +53,7 @@ class SpriteSlot;
 #define TEXT_DISPLAY_MAX_SIZE 40
 #define DIRTY_AREAS_SIZE (SPRITE_SLOTS_MAX_SIZE + TEXT_DISPLAY_MAX_SIZE)
 
-enum { 
+enum {
 	SCENEFLAG_DITHER		= 0x01,     // Dither to 16 colors
 	SCENEFLAG_LOAD_SHADOW	= 0x10		// Load hard shadows
 };
@@ -65,7 +65,7 @@ public:
 	PrepType _prepType;
 
 	VerbInit() {}
-	VerbInit(int id, VerbType verbType, PrepType prepType): _id(id), 
+	VerbInit(int id, VerbType verbType, PrepType prepType): _id(id),
 		_verbType(verbType), _prepType(prepType) {}
 };
 
@@ -180,7 +180,7 @@ public:
 	/**
 	 * loads the data
 	 */
-	void load(int sceneId, int variant, const Common::String &resName, int flags, 
+	void load(int sceneId, int variant, const Common::String &resName, int flags,
 		MSurface &depthSurface, MSurface &bgSurface);
 
 	/**
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index f0564c5fbc..09f87f3f8b 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -278,7 +278,7 @@ void ScreenObjects::check(bool scanFlag) {
 	if (!_vm->_events->_mouseButtons || _inputMode != kInputBuildingSentences)
 		_vm->_events->_rightMousePressed = false;
 
-	if ((_vm->_events->_mouseMoved || userInterface._scrollbarActive 
+	if ((_vm->_events->_mouseMoved || userInterface._scrollbarActive
 			|| _v8332A || _forceRescan) && scanFlag) {
 		_category = CAT_NONE;
 		_selectedObject = scanBackwards(_vm->_events->currentPos(), LAYER_GUI);
@@ -386,7 +386,7 @@ void ScreenObjects::elementHighlighted() {
 		indexEnd = 9;
 		varA = 5;
 		topIndex = 0;
-		idxP = !_vm->_events->_rightMousePressed ? &userInterface._highlightedCommandIndex : 
+		idxP = !_vm->_events->_rightMousePressed ? &userInterface._highlightedCommandIndex :
 			&userInterface._selectedActionIndex;
 
 		if (_vm->_events->_rightMousePressed && userInterface._selectedItemVocabIdx >= 0)
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index cbe0471315..a7c6dedb12 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -63,7 +63,7 @@ SequenceEntry::SequenceEntry() {
 #define SEQUENCE_LIST_SIZE 30
 
 SequenceList::SequenceList(MADSEngine *vm) : _vm(vm) {
-	// IMPORTANT: Preallocate timer slots. Note that sprite slots refer to entries 
+	// IMPORTANT: Preallocate timer slots. Note that sprite slots refer to entries
 	// in this list by index, so we can't just add or delete entries later
 	for (int i = 0; i < SEQUENCE_LIST_SIZE; ++i) {
 		SequenceEntry rec;
@@ -369,7 +369,7 @@ void SequenceList::delay(uint32 priorFrameTime, uint32 currentTime) {
 }
 
 void SequenceList::setAnimRange(int seqIndex, int startVal, int endVal) {
-	Scene &scene = _vm->_game->_scene;	
+	Scene &scene = _vm->_game->_scene;
 	SequenceEntry &seqEntry = _entries[seqIndex];
 	SpriteAsset &spriteSet = *scene._sprites[seqEntry._spritesIndex];
 	int numSprites = spriteSet.getCount();
@@ -433,7 +433,7 @@ int SequenceList::addSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks, i
 	Scene &scene = _vm->_game->_scene;
 	MSprite *spriteFrame = scene._sprites[srcSpriteIdx]->getFrame(0);
 	int depth = scene._depthSurface.getDepth(Common::Point(
-		spriteFrame->_offset.x + (spriteFrame->w / 2), 
+		spriteFrame->_offset.x + (spriteFrame->w / 2),
 		spriteFrame->_offset.y + (spriteFrame->h / 2)));
 
 	return add(srcSpriteIdx, flipped, 1, triggerCountdown, timeoutTicks, extraTicks, numTicks, 0, 0,
@@ -450,7 +450,7 @@ int SequenceList::addReverseSpriteCycle(int srcSpriteIdx, bool flipped, int numT
 		spriteFrame->_offset.x + (spriteFrame->w / 2),
 		spriteFrame->_offset.y + (spriteFrame->h / 2)));
 
-	return add(srcSpriteIdx, flipped, asset->getCount(), triggerCountdown, timeoutTicks, extraTicks, 
+	return add(srcSpriteIdx, flipped, asset->getCount(), triggerCountdown, timeoutTicks, extraTicks,
 		numTicks, 0, 0, true, 100, depth - 1, -1, ANIMTYPE_CYCLED, 0, 0);
 }
 
@@ -463,7 +463,7 @@ int SequenceList::startCycle(int srcSpriteIndex, bool flipped, int cycleIndex) {
 	return result;
 }
 
-int SequenceList::startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks, 
+int SequenceList::startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown, int timeoutTicks, int extraTicks) {
 	SpriteAsset *sprites = _vm->_game->_scene._sprites[srcSpriteIndex];
 	MSprite *frame = sprites->getFrame(0);
@@ -508,4 +508,4 @@ void SequenceList::setDone(int seqIndex) {
 	_entries[seqIndex]._timeout = _vm->_game->_player._priorTimer;
 }
 
-} // End of namespace 
+} // End of namespace
diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h
index 19759001de..8abef5c3e1 100644
--- a/engines/mads/sequence.h
+++ b/engines/mads/sequence.h
@@ -32,8 +32,8 @@ namespace MADS {
 
 class SpriteSlot;
 
-enum SequenceTrigger { 
-	SEQUENCE_TRIGGER_EXPIRE = 0,	// Trigger when the sequence finishes 
+enum SequenceTrigger {
+	SEQUENCE_TRIGGER_EXPIRE = 0,	// Trigger when the sequence finishes
 	SEQUENCE_TRIGGER_LOOP = 1,		// Trigger when the sequence loops
 	SEQUENCE_TRIGGER_SPRITE = 2		// Trigger when sequence reaches specific sprite
 };
@@ -103,7 +103,7 @@ public:
 	int add(int spriteListIndex, bool flipped, int frameIndex, int triggerCountdown, int delayTicks,
 		int extraTicks, int numTicks, int msgX, int msgY, bool nonFixed, int scale, int depth,
 		int frameInc, SpriteAnimType animType, int numSprites, int frameStart);
-	
+
 	int addTimer(int timeout, int abortVal);
 	void remove(int seqIndex);
 	void setSpriteSlot(int seqIndex, SpriteSlot &spriteSlot);
@@ -114,13 +114,13 @@ public:
 	void scan();
 	void setDepth(int seqIndex, int depth);
 	void setMsgPosition(int seqIndex, const Common::Point &pt);
-	int addSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks, 
+	int addSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 	int addReverseSpriteCycle(int srcSpriteIdx, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 
 	int startCycle(int srcSpriteIdx, bool flipped, int cycleIndex);
-	int startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks, 
+	int startReverseCycle(int srcSpriteIndex, bool flipped, int numTicks,
 		int triggerCountdown = 0, int timeoutTicks = 0, int extraTicks = 0);
 	void updateTimeout(int spriteIdx, int seqIndex);
 	void setScale(int spriteIdx, int scale);
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 432a0e17df..b0506fc40a 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -58,8 +58,8 @@ MSprite::MSprite(): MSurface() {
 }
 
 MSprite::MSprite(Common::SeekableReadStream *source, const Common::Array<RGB6> &palette,
-		const Common::Rect &bounds): 
-		MSurface(bounds.width(), bounds.height()), 
+		const Common::Rect &bounds):
+		MSurface(bounds.width(), bounds.height()),
 		_offset(Common::Point(bounds.left, bounds.top)) {
 	// Load the sprite data
 	loadSprite(source, palette);
@@ -158,7 +158,7 @@ SpriteSlot::SpriteSlot(SpriteFlags type, int seqIndex) {
 
 bool SpriteSlot::operator==(const SpriteSlotSubset &other) const {
 	return (_spritesIndex == other._spritesIndex) && (_frameNumber == other._frameNumber) &&
-		(_position == other._position) && (_depth == other._depth) && 
+		(_position == other._position) && (_depth == other._depth) &&
 		(_scale == other._scale);
 }
 
@@ -324,7 +324,7 @@ void SpriteSlots::drawSprites(MSurface *s) {
 
 		if ((slot._scale < 100) && (slot._scale != -1)) {
 			// Minimalised drawing
-			s->copyFrom(spr, slot._position, slot._depth, &scene._depthSurface, 
+			s->copyFrom(spr, slot._position, slot._depth, &scene._depthSurface,
 				slot._scale, sprite->getTransparencyIndex());
 		} else {
 			int xp, yp;
@@ -339,7 +339,7 @@ void SpriteSlots::drawSprites(MSurface *s) {
 
 			if (slot._depth > 1) {
 				// Draw the frame with depth processing
-				s->copyFrom(spr, Common::Point(xp, yp), slot._depth, &scene._depthSurface, 
+				s->copyFrom(spr, Common::Point(xp, yp), slot._depth, &scene._depthSurface,
 					100, sprite->getTransparencyIndex());
 			} else {
 				// No depth, so simply draw the image
diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h
index 745e0700e8..f807e733b7 100644
--- a/engines/mads/sprites.h
+++ b/engines/mads/sprites.h
@@ -180,7 +180,7 @@ public:
 	void deleteTimer(int seqIndex);
 
 	/**
-	 * Add a new slot entry and return it's index 
+	 * Add a new slot entry and return it's index
 	 */
 	int add();
 
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index e23ecf4a08..4d8ed82f98 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -148,14 +148,14 @@ void UISlots::draw(bool updateFlag, bool delFlag) {
 
 			if (dirtyArea->_textActive) {
 				SpriteAsset *asset = scene._sprites[slot._spritesIndex];
-			
+
 				// Get the frame details
 				int frameNumber = ABS(slot._frameNumber);
 				bool flipped = slot._frameNumber < 0;
 
 				if (slot._segmentId == IMG_SPINNING_OBJECT) {
 					MSprite *sprite = asset->getFrame(frameNumber);
-					sprite->copyTo(&userInterface, slot._position, 
+					sprite->copyTo(&userInterface, slot._position,
 						sprite->getTransparencyIndex());
 				} else {
 					MSprite *sprite = asset->getFrame(frameNumber - 1);
@@ -309,7 +309,7 @@ void Conversation::start() {
 
 /*------------------------------------------------------------------------*/
 
-UserInterface::UserInterface(MADSEngine *vm) : _vm(vm), _dirtyAreas(vm), 
+UserInterface::UserInterface(MADSEngine *vm) : _vm(vm), _dirtyAreas(vm),
 		_uiSlots(vm) {
 	_invSpritesIndex = -1;
 	_invFrameNumber = 1;
@@ -363,7 +363,7 @@ void UserInterface::load(const Common::String &resName) {
 	// Read in the surface data
 	Common::SeekableReadStream *pixelsStream = madsPack.getItemStream(1);
 	pixelsStream->read(_surface.getData(), MADS_SCREEN_WIDTH * MADS_INTERFACE_HEIGHT);
-	delete pixelsStream; 
+	delete pixelsStream;
 }
 
 void UserInterface::setup(InputMode inputMode) {
@@ -418,7 +418,7 @@ void UserInterface::drawTextElements() {
 
 void UserInterface::mergeFrom(MSurface *src, const Common::Rect &srcBounds,
 	const Common::Point &destPos, int transparencyIndex) {
-	// Validation of the rectangle and position	
+	// Validation of the rectangle and position
 	int destX = destPos.x, destY = destPos.y;
 	if ((destX >= w) || (destY >= h))
 		return;
@@ -502,7 +502,7 @@ void UserInterface::updateInventoryScroller() {
 		// FIXME: This scrolls the inventory up when selecting verbs or attempting to combine items
 		false/*(screenObjects._category != CAT_INV_SCROLLER && _scrollbarOldActive == SCROLLBAR_ELEVATOR)*/
 	) && (_vm->_events->_mouseStatusCopy || _vm->_easyMouse)) {
-		if ((_vm->_events->_mouseClicked || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy)) 
+		if ((_vm->_events->_mouseClicked || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy))
 				&& (screenObjects._category == CAT_INV_SCROLLER))
 			_scrollbarStrokeType = (ScrollbarActive)screenObjects._spotId;
 
@@ -637,7 +637,7 @@ void UserInterface::writeVocab(ScrCategory category, int id) {
 			break;
 		}
 
-		font->setColorMode((id == 4) || (_scrollbarActive == SCROLLBAR_ELEVATOR) ? 
+		font->setColorMode((id == 4) || (_scrollbarActive == SCROLLBAR_ELEVATOR) ?
 			SELMODE_HIGHLIGHTED : SELMODE_UNSELECTED);
 		font->writeString(this, vocabStr, Common::Point(bounds.left, bounds.top));
 		break;
@@ -705,7 +705,7 @@ void UserInterface::loadElements() {
 			CAT_INV_ANIM, 0);
 	}
 
-	if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences || 
+	if (_vm->_game->_screenObjects._inputMode == kInputBuildingSentences ||
 			_vm->_game->_screenObjects._inputMode == kInputLimitedSentences) {
 		_categoryIndexes[CAT_HOTSPOT - 1] = _vm->_game->_screenObjects.size() + 1;
 		for (int hotspotIdx = scene._hotspots.size() - 1; hotspotIdx >= 0; --hotspotIdx) {
@@ -878,7 +878,7 @@ void UserInterface::refresh() {
 
 void UserInterface::inventoryAnim() {
 	Scene &scene = _vm->_game->_scene;
-	if (_vm->_game->_screenObjects._inputMode == kInputConversation || 
+	if (_vm->_game->_screenObjects._inputMode == kInputConversation ||
 			_vm->_game->_screenObjects._inputMode == kInputLimitedSentences ||
 			_invSpritesIndex < 0)
 		return;
@@ -984,7 +984,7 @@ void UserInterface::selectObject(int invIndex) {
 		if (maxVocab) {
 			assert(_uiSlots.size() < 50);
 			int vocabHeight = maxVocab * 8;
-			
+
 			Common::Rect bounds(240, 3, 240 + 80, 3 + vocabHeight);
 			_uiSlots.add(bounds);
 			_uiSlots.draw(false, false);
@@ -1028,7 +1028,7 @@ void UserInterface::updateSelection(ScrCategory category, int newIndex, int *idx
 
 		if (oldIndex >= 0) {
 			writeVocab(category, oldIndex);
-			
+
 			if (getBounds(category, oldIndex, bounds))
 				updateRect(bounds);
 		}
diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h
index 04a8d090dd..2fdc80bf86 100644
--- a/engines/mads/user_interface.h
+++ b/engines/mads/user_interface.h
@@ -51,7 +51,7 @@ public:
 	int _spritesIndex;
 	int _frameNumber;
 	Common::Point _position;
-	
+
 	// Only used for IMG_OVERPRINT
 	int _width;
 	int _height;