JANITORIAL: Remove trailing spaces

379 files changed, 1319 insertions, 1319 deletions

diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 08006fe1b7..5a0f79721e 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1333,7 +1333,7 @@ void Cast::doCast(int param1) {
 		for (int idx = 0; idx < 5 && !_vm->shouldQuit() &&
 				!_vm->_events->isKeyMousePressed(); ++idx)
 			_vm->_events->pollEventsAndWait();
-		
+
 		if (_vm->_events->isKeyMousePressed())
 			break;
 
@@ -1682,7 +1682,7 @@ void River::updateObstacles() {
 
 void River::riverSetPhysX() {
 	int xAmt = (_vm->_scrollCol * 16) + _vm->_scrollX;
-	
+
 	for (RiverStruct *cur = _topList; cur <= _botList; ++cur) {
 		cur->_xp = xAmt - (_screenVertX - cur->_riverX);
 	}
diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h
index 6396f80199..003178ea15 100644
--- a/engines/access/amazon/amazon_room.h
+++ b/engines/access/amazon/amazon_room.h
@@ -61,7 +61,7 @@ public:
 	virtual ~AmazonRoom();
 
 	virtual void init4Quads();
-	
+
 	virtual void roomMenu();
 };
 
diff --git a/engines/access/animation.h b/engines/access/animation.h
index 72621c4d11..49417ec5fc 100644
--- a/engines/access/animation.h
+++ b/engines/access/animation.h
@@ -49,7 +49,7 @@ public:
 	~AnimationManager();
 	void freeAnimationData();
 	void loadAnimations(Resource *res);
-	
+
 	Animation *findAnimation(int animId);
 	Animation *setAnimation(int animId);
 
diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index 37f4c7082e..577746f7b4 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -173,7 +173,7 @@ void BaseSurface::copyTo(BaseSurface *dest) {
 	if (dest->empty())
 		dest->create(this->w, this->h);
 
-	dest->blitFrom(*this); 
+	dest->blitFrom(*this);
 }
 
 void BaseSurface::saveBlock(const Common::Rect &bounds) {
diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp
index 48c7290249..308733ece2 100644
--- a/engines/access/debugger.cpp
+++ b/engines/access/debugger.cpp
@@ -94,7 +94,7 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) {
 			debugPrintf("Unused Room Number\n");
 			return true;
 		}
-			
+
 		_vm->_player->_roomNumber = newRoom;
 
 		_vm->_room->_function = FN_CLEAR1;
diff --git a/engines/access/decompress.cpp b/engines/access/decompress.cpp
index 3de376c193..6d5b613fe2 100644
--- a/engines/access/decompress.cpp
+++ b/engines/access/decompress.cpp
@@ -31,7 +31,7 @@ namespace Access {
 void LzwDecompressor::decompress(byte *source, byte *dest) {
 
 	_source = source;
-	
+
 	byte litByte = 0;
 	uint16 oldCode = 0;
 	uint16 copyLength, maxCodeValue, code, nextCode, lastCode;
diff --git a/engines/access/events.cpp b/engines/access/events.cpp
index 21ff0d0928..3d3b97e028 100644
--- a/engines/access/events.cpp
+++ b/engines/access/events.cpp
@@ -65,9 +65,9 @@ void EventsManager::setNormalCursor(CursorType cursorId) {
 
 void EventsManager::setCursor(CursorType cursorId) {
 	if (cursorId == _cursorId)
-		return;	
+		return;
 	_cursorId = cursorId;
-	
+
 	if (cursorId == CURSOR_INVENTORY) {
 		// Set the cursor
 		CursorMan.replaceCursor(_invCursor.getPixels(), _invCursor.w, _invCursor.h,
@@ -209,9 +209,9 @@ void EventsManager::keyControl(Common::KeyCode keycode, bool isKeyDown) {
 		}
 		return;
 	}
-	
+
 	_keyCode = keycode;
-	
+
 	switch (keycode) {
 	case Common::KEYCODE_UP:
 	case Common::KEYCODE_KP8:
diff --git a/engines/access/files.h b/engines/access/files.h
index 61fccc2431..151890f338 100644
--- a/engines/access/files.h
+++ b/engines/access/files.h
@@ -77,7 +77,7 @@ private:
 	 * Handles setting up the resource with a stream for the located resource
 	 */
 	void handleFile(Resource *res);
-	
+
 	/**
 	 * Handles loading a screen surface and palette with decoded resource
 	 */
diff --git a/engines/access/inventory.h b/engines/access/inventory.h
index 1d88bf4555..e91ca2484e 100644
--- a/engines/access/inventory.h
+++ b/engines/access/inventory.h
@@ -119,7 +119,7 @@ public:
 	int _startTravelItem;
 public:
 	InventoryManager(AccessEngine *vm);
-	
+
 	int &operator[](int idx);
 
 	int useItem();
diff --git a/engines/access/player.cpp b/engines/access/player.cpp
index 0162491aee..ccef0d6740 100644
--- a/engines/access/player.cpp
+++ b/engines/access/player.cpp
@@ -142,7 +142,7 @@ void Player::loadTexPalette() {
 	int size = texPal->_size;
 	assert(size == 768);
 	_manPal1 = new byte[size];
-	memcpy(_manPal1, texPal->data(), size);	
+	memcpy(_manPal1, texPal->data(), size);
 }
 
 void Player::loadSprites(const Common::String &name) {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 2d29ad0718..7da9dfc429 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -300,10 +300,10 @@ void Screen::cyclePaletteBackwards() {
 		_vm->_timers[6]._flag++;
 		byte *pStart = &_rawPalette[_cycleStart * 3];
 		byte *pEnd = &_rawPalette[_endCycle * 3];
-		
+
 		for (int idx = _startCycle; idx < _endCycle; ++idx) {
 			g_system->getPaletteManager()->setPalette(pStart, idx, 1);
-			
+
 			pStart += 3;
 			if (pStart == pEnd)
 				pStart = &_rawPalette[_cycleStart * 3];
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 38313640f1..2cebc3e3c6 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -840,7 +840,7 @@ void Scripts::cmdTexChoice() {
 	_vm->_fonts._charSet._lo = 1;
 	_vm->_fonts._charSet._hi = 8;
 	_vm->_fonts._charFor._hi = 255;
-	
+
 	if (_vm->getGameID() == GType_MartianMemorandum) {
 		_vm->_fonts._charFor._lo = 247;
 		_vm->_screen->_maxChars = 23;
@@ -912,7 +912,7 @@ void Scripts::cmdTexChoice() {
 				_vm->_events->debounceLeft();
 				int x = _vm->_events->_mousePos.x;
 				for (int i = 0; i < BTN_COUNT; i++) {
-					if (((_vm->getGameID() == GType_MartianMemorandum) && (x >= BTN_RANGES_v1[i][0]) && (x < BTN_RANGES_v1[i][1])) 
+					if (((_vm->getGameID() == GType_MartianMemorandum) && (x >= BTN_RANGES_v1[i][0]) && (x < BTN_RANGES_v1[i][1]))
 					||  ((_vm->getGameID() == GType_Amazon) && (x >= BTN_RANGES_v2[i][0]) && (x < BTN_RANGES_v2[i][1]))) {
 
 						choice = i;
@@ -1049,7 +1049,7 @@ void Scripts::cmdDispAbout() {
 	if (btnSelected == 2)
 		_vm->_useItem = -1;
 	else
-		_vm->_useItem = _vm->_travelBox->_tempListIdx[boxX];		
+		_vm->_useItem = _vm->_travelBox->_tempListIdx[boxX];
 }
 
 void Scripts::cmdPushLocation() {
diff --git a/engines/access/scripts.h b/engines/access/scripts.h
index 4cfedf3b3f..ad9cb8661e 100644
--- a/engines/access/scripts.h
+++ b/engines/access/scripts.h
@@ -73,12 +73,12 @@ protected:
 	void cmdAnim();
 	void cmdSetFlag();
 	void cmdCheckFlag();
-	
+
 	/**
 	 * Jump to another script
 	 */
 	void cmdGoto();
-	
+
 	void cmdAddScore();
 	void cmdSetInventory();
 	void cmdCheckInventory();
@@ -162,7 +162,7 @@ public:
 	void freeScriptData();
 
 	void searchForSequence();
-	
+
 	int executeScript();
 
 	void findNull();
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp
index cf52bc58c5..baa14ce21e 100644
--- a/engines/access/sound.cpp
+++ b/engines/access/sound.cpp
@@ -155,7 +155,7 @@ void SoundManager::playSound(Resource *res, int priority, bool loop, int soundIn
 		error("Unknown format");
 
 	if (loop) {
-		_queue.push_back(QueuedSound(new Audio::LoopingAudioStream(audioStream, 0, 
+		_queue.push_back(QueuedSound(new Audio::LoopingAudioStream(audioStream, 0,
 			DisposeAfterUse::NO), soundIndex));
 	} else {
 		_queue.push_back(QueuedSound(audioStream, soundIndex));
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 22842a5855..54231a9efe 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -97,7 +97,7 @@ void VideoPlayer::setVideo(BaseSurface *vidSurface, const Common::Point &pt, con
 void VideoPlayer::setVideo(BaseSurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate) {
 	// Open up video stream
 	_videoData = _vm->_files->loadFile(videoFile);
-	
+
 	setVideo(vidSurface, pt, rate);
 }
 
diff --git a/engines/adl/disk.h b/engines/adl/disk.h
index 653d76ff10..4c0df834fa 100644
--- a/engines/adl/disk.h
+++ b/engines/adl/disk.h
@@ -135,7 +135,7 @@ private:
 	enum FileType {
 		kFileTypeText = 0,
 		kFileTypeAppleSoft = 2,
-		kFileTypeBinary = 4 
+		kFileTypeBinary = 4
 	};
 
 	enum {
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 19aca6f2c4..381c462ade 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -353,7 +353,7 @@ int AgiEngine::playGame() {
 			if (appleIIgsDelayOverwrite->gameId == getGameID())
 				break; // game found
 			appleIIgsDelayOverwrite++;
-		}		
+		}
 	}
 
 	do {
diff --git a/engines/agi/mouse_cursor.h b/engines/agi/mouse_cursor.h
index c086359b0f..f8dc21dc4c 100644
--- a/engines/agi/mouse_cursor.h
+++ b/engines/agi/mouse_cursor.h
@@ -192,7 +192,7 @@ static const byte MOUSECURSOR_MACINTOSH_BUSY[] = {
 	1,2,2,2,2,1,2,2,2,1,
 	1,2,2,2,2,1,2,2,2,1,
 	1,2,2,2,2,1,2,2,2,1,
-	1,2,2,1,1,1,2,2,2,1,		
+	1,2,2,1,1,1,2,2,2,1,
 	1,2,2,2,2,2,2,2,2,1,
 	1,2,2,2,2,2,2,2,2,1,
 	0,1,2,2,2,2,2,2,1,0,
diff --git a/engines/agi/systemui.cpp b/engines/agi/systemui.cpp
index 1f26267ad6..c7ca7cd5d4 100644
--- a/engines/agi/systemui.cpp
+++ b/engines/agi/systemui.cpp
@@ -975,7 +975,7 @@ void SystemUI::askForVerificationKeyPress(uint16 newKey) {
 	if (executeButton) {
 		if (_askForVerificationMouseActiveButtonNr >= 0) {
 			SystemUIButtonEntry *button = &_buttonArray[_askForVerificationMouseActiveButtonNr];
-		
+
 			if (button->active) {
 				if (!button->isDefault) {
 					// Not default button? -> that's cancel
diff --git a/engines/agi/systemui.h b/engines/agi/systemui.h
index 283de8794c..1f6e2988bf 100644
--- a/engines/agi/systemui.h
+++ b/engines/agi/systemui.h
@@ -69,7 +69,7 @@ public:
 	bool quitDialog();
 
 private:
-	
+
 
 public:
 	const char *getInventoryTextNothing();
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index d11ff201ea..3a7158a203 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -179,7 +179,7 @@ int MidiPlayer::open(int gameType, bool isDemo) {
 		//setTimerRate(_driver->getBaseTempo());
 		return 0;
 	}
-	
+
 	case kMusicModeMilesAudio: {
 		switch (musicType) {
 		case MT_ADLIB: {
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 1ba0f56353..6ec8931108 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1317,7 +1317,7 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
 
 			if (getGameType() == GType_WW && getPlatform() == Common::kPlatformDOS && derefItem(item->parent) == NULL)
 				item->parent = 0;
-						
+
 			parent_item = derefItem(parent);
 			setItemParent(item, parent_item);
 
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index f92e030c88..aef81fad8a 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -1624,7 +1624,7 @@ yyparse ()
 #endif
 #endif
 {
-  
+
   int yystate;
   int yyn;
   int yyresult;
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index d268be4aec..5c0eeedf7e 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -34,7 +34,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -52,7 +52,7 @@ typedef uint64_t flex_uint64_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -168,7 +168,7 @@ extern FILE *yyin, *yyout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -225,7 +225,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -764,7 +764,7 @@ extern int yywrap (void );
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -888,7 +888,7 @@ YY_DECL
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 69 "engines/director/lingo/lingo-lex.l"
 
 
@@ -1641,7 +1641,7 @@ static int yy_get_next_buffer (void)
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
+
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
@@ -1696,7 +1696,7 @@ static int yy_get_next_buffer (void)
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-    
+
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
@@ -1739,7 +1739,7 @@ static int yy_get_next_buffer (void)
 
 {
 	int c;
-    
+
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1808,12 +1808,12 @@ static int yy_get_next_buffer (void)
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void yyrestart  (FILE * input_file )
 {
-    
+
 	if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1826,11 +1826,11 @@ static int yy_get_next_buffer (void)
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-    
+
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yypop_buffer_state();
@@ -1870,13 +1870,13 @@ static void yy_load_buffer_state  (void)
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1899,11 +1899,11 @@ static void yy_load_buffer_state  (void)
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- * 
+ *
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-    
+
 	if ( ! b )
 		return;
 
@@ -1919,7 +1919,7 @@ static void yy_load_buffer_state  (void)
 #ifndef __cplusplus
 extern int isatty (int );
 #endif /* __cplusplus */
-    
+
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
@@ -1928,7 +1928,7 @@ extern int isatty (int );
 
 {
 	int oerrno = errno;
-    
+
 	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1944,13 +1944,13 @@ extern int isatty (int );
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
+
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
     void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1979,7 +1979,7 @@ extern int isatty (int );
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -2009,7 +2009,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
 void yypop_buffer_state (void)
 {
@@ -2033,7 +2033,7 @@ void yypop_buffer_state (void)
 static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
-    
+
 	if (!(yy_buffer_stack)) {
 
 		/* First allocation is just for 2 elements, since we don't know if this
@@ -2046,9 +2046,9 @@ static void yyensure_buffer_stack (void)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2076,13 +2076,13 @@ static void yyensure_buffer_stack (void)
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
+ *
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -2111,14 +2111,14 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- * 
+ *
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
 YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
-    
+
 	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
@@ -2126,7 +2126,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
  * scan from a @e copy of @a bytes.
  * @param bytes the byte buffer to scan
  * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
+ *
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
@@ -2134,7 +2134,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n, i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
 	buf = (char *) yyalloc(n  );
@@ -2188,16 +2188,16 @@ static void yy_fatal_error (yyconst char* msg )
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- * 
+ *
  */
 int yyget_lineno  (void)
 {
-        
+
     return yylineno;
 }
 
 /** Get the input stream.
- * 
+ *
  */
 FILE *yyget_in  (void)
 {
@@ -2205,7 +2205,7 @@ FILE *yyget_in  (void)
 }
 
 /** Get the output stream.
- * 
+ *
  */
 FILE *yyget_out  (void)
 {
@@ -2213,7 +2213,7 @@ FILE *yyget_out  (void)
 }
 
 /** Get the length of the current token.
- * 
+ *
  */
 yy_size_t yyget_leng  (void)
 {
@@ -2221,7 +2221,7 @@ yy_size_t yyget_leng  (void)
 }
 
 /** Get the current token.
- * 
+ *
  */
 
 char *yyget_text  (void)
@@ -2231,18 +2231,18 @@ char *yyget_text  (void)
 
 /** Set the current line number.
  * @param line_number
- * 
+ *
  */
 void yyset_lineno (int  line_number )
 {
-    
+
     yylineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
- * 
+ *
  * @see yy_switch_to_buffer
  */
 void yyset_in (FILE *  in_str )
@@ -2296,7 +2296,7 @@ static int yy_init_globals (void)
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)
 {
-    
+
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
 		yy_delete_buffer(YY_CURRENT_BUFFER  );
diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
index 8ac2aa552c..f3828896f1 100644
--- a/engines/dm/detection.cpp
+++ b/engines/dm/detection.cpp
@@ -71,7 +71,7 @@ static const DMADGameDescription gameDescriptions[] = {
 	    { kDMSavePlatformAcceptAny }
 	},
 
-	{	
+	{
 		AD_TABLE_END_MARKER, kDMSaveTargetNone, kDMSaveFormatNone, kDMSavePlatformNone,
 		{kDMSaveTargetNone}, {kDMSaveFormatNone}, {kDMSavePlatformNone}
 	}
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index 39ae3da50f..46d90366cd 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -63,7 +63,7 @@ DoorFrames::DoorFrames(Frame f1, Frame f2_1, Frame f2_2, Frame f2_3,
 	_rightHorizontal[1] = f4_2;
 	_rightHorizontal[2] = f4_3;
 }
-	
+
 DisplayMan::DisplayMan(DMEngine *dmEngine) : _vm(dmEngine) {
 	_bitmapScreen = nullptr;
 	_bitmaps = nullptr;
@@ -898,7 +898,7 @@ void DisplayMan::fillBoxBitmap(byte *destBitmap, Box &box, Color color, int16 by
 void DisplayMan::blitBoxFilledWithMaskedBitmap(byte *src, byte *dest, byte *mask, byte *tmp, Box& box,
 											   int16 lastUnitIndex, int16 firstUnitIndex, int16 destByteWidth, Color transparent,
 											   int16 xPos, int16 yPos, int16 destHeight, int16 height2) {
-	
+
 	// FIXME: does not produce the same effect as the original
 
 	byte nextUnitIndex = firstUnitIndex;
diff --git a/engines/dm/loadsave.cpp b/engines/dm/loadsave.cpp
index 111280c958..8bc3770226 100644
--- a/engines/dm/loadsave.cpp
+++ b/engines/dm/loadsave.cpp
@@ -393,7 +393,7 @@ bool DMEngine::writeCompleteSaveFile(int16 saveSlot, Common::String& saveDescrip
 	file->flush();
 	file->finalize();
 	delete file;
-	
+
 	return true;
 }
 
diff --git a/engines/drascula/actors.cpp b/engines/drascula/actors.cpp
index b459c4539b..3b1ac7cb60 100644
--- a/engines/drascula/actors.cpp
+++ b/engines/drascula/actors.cpp
@@ -398,7 +398,7 @@ void DrasculaEngine::increaseFrameNum() {
 		curHeight = (int)newHeight;
 		curWidth = (int)newWidth;
 	}
-	
+
 	// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
 	// Chapter 5 Room 45 is the castle tower part
 	// Fixing the character's coordinate(0,0) in the tower section to prevent out of window coordinates and crash
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 6bfb2e1823..8634b6c586 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -217,7 +217,7 @@ void DrasculaEngine::print_abc(const char *said, int screenX, int screenY) {
 	int letterY = 0, letterX = 0, i;
 	uint len = strlen(said);
 	byte c;
-	
+
 	byte *srcSurface = tableSurface;
 	if (_lang == kSpanish && currentChapter == 6)
 		srcSurface = extraSurface;
@@ -329,7 +329,7 @@ bool DrasculaEngine::textFitsCentered(char *text, int x) {
 	//if (x > 160)
 	//	x = 315 - x;
 	//return (halfLen <= x);
-	
+
 	// The commented out code above is what the original engine is doing. Instead of testing the
 	// upper bound if x is greater than 160 it takes the complement to 315 and test only the lower
 	// bounds.
@@ -349,15 +349,15 @@ bool DrasculaEngine::textFitsCentered(char *text, int x) {
 void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 	char msg[200];
 	Common::strlcpy(msg, message, 200);
-	
+
 	// We make sure to have a width of at least 120 pixels by clipping the center.
 	// In theory since the screen width is 320 I would expect something like this:
 	// x = CLIP<int>(x, 60, 260);
 	// return (x - halfLen >= 0 && x + halfLen <= 319);
-	
+
 	// The engines does things differently though. It tries to clips text at 315 instead of 319.
 	// See also the comment in textFitsCentered().
-	
+
 	textX = CLIP<int>(textX, 60, 255);
 
 	// If the message fits on screen as-is, just print it here
@@ -424,7 +424,7 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
 				Common::strlcpy(messageLines[curLine++], messageCurLine, 41);
 		}
 	}
-	
+
 	// The original starts to draw (nbLines + 2) lines above textY.
 	// Also clip to the screen height although the original does not do it.
 	int y = textY - (curLine + 2) * CHAR_HEIGHT;
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index e99898da5a..a1d7d615ea 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -255,7 +255,7 @@ bool DrasculaEngine::loadGame(int slot) {
 	if (!(in = _saveFileMan->openForLoading(saveFileName))) {
 		error("missing savegame file %s", saveFileName.c_str());
 	}
-	
+
 	// If we currently are in room 102 while being attached below the pendulum
 	// the character is invisible and some surface are temporarily used for other
 	// things. Reset those before loading the savegame otherwise we may have some
@@ -267,7 +267,7 @@ bool DrasculaEngine::loadGame(int slot) {
 		loadPic(97, extraSurface);
 		loadPic(99, backSurface);
 	}
-	
+
 
 	loadMetaData(in, slot, true);
 	Graphics::skipThumbnail(*in);
@@ -300,7 +300,7 @@ bool DrasculaEngine::loadGame(int slot) {
 	if (!sscanf(currentData, "%d.ald", &roomNum)) {
 		error("Bad save format");
 	}
-	
+
 	// When loading room 102 while being attached below the pendulum Some variables
 	// are not correctly set and can cause random crashes when calling enterRoom below.
 	// The crash occurs in moveCharacters() when accessing factor_red[curY + curHeight].
@@ -309,10 +309,10 @@ bool DrasculaEngine::loadGame(int slot) {
 		curY = 108;
 		curWidth = curHeight = 0;
 	}
-	
+
 	enterRoom(roomNum);
 	selectVerb(kVerbNone);
-	
+
 	// When loading room 102 while being attached below the pendulum we
 	// need to call activatePendulum() to properly initialized the scene.
 	if (_roomNumber == 102 && flags[1] == 2)
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index cc329b206b..7ac2cc6406 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -379,10 +379,10 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 
 	int y_mask_talk = 170;
 	int face;
-	
+
 	// Fix bug #5903 DRASCULA-IT: Crash/graphic glitch at castle towers
 	// Chapter 5 Room 45 is the castle tower part
-	// We use this variable as a condition below because at the castle towers we don't want to draw out the head 
+	// We use this variable as a condition below because at the castle towers we don't want to draw out the head
 	bool notTowers = !((currentChapter == 5) && (_roomNumber == 45));
 
 	if (currentChapter == 6) {
@@ -488,7 +488,7 @@ void DrasculaEngine::talk(const char *said, const char *filename) {
 				centerText(said, 160, 25);
 			}
 		}
-	
+
 
 		updateScreen();
 		updateEvents();
diff --git a/engines/gnap/fontdata.h b/engines/gnap/fontdata.h
index 61128211fc..0631d1d214 100644
--- a/engines/gnap/fontdata.h
+++ b/engines/gnap/fontdata.h
@@ -32,7 +32,7 @@ struct FONT_CHAR_INFO {
   FONT_CHAR_INFO(byte width, uint16 offset) : _width(width), _offset(offset) {}
 };
 
-/* 
+/*
 **  Font data for DejaVu Sans 9pt
 */
 
diff --git a/engines/gnap/gamesys.h b/engines/gnap/gamesys.h
index b9752bde06..789789e5e7 100644
--- a/engines/gnap/gamesys.h
+++ b/engines/gnap/gamesys.h
@@ -168,7 +168,7 @@ public:
 
 	int32 _gameSysClock, _lastUpdateClock;
 	bool _animationsDone;
-	
+
 
 	Graphics::Surface *_backgroundSurface;
 	Graphics::Surface *_frontSurface;
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 47fdaacf7a..eaeb64a64d 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -1681,7 +1681,7 @@ void Script::o2_copyscreentobg() {
 	// TODO: Parameter
 	if (val)
 		warning("o2_copyscreentobg: Param is %d", val);
-	
+
 	Graphics::Surface *screen = _vm->_system->lockScreen();
 	_vm->_graphicsMan->_background.copyFrom(screen->getSubArea(Common::Rect(0, 80, 640, 320)));
 	_vm->_system->unlockScreen();
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 4f0a0da777..11a64114b5 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -379,7 +379,7 @@ void LabEngine::decIncInv(uint16 *curInv, bool decreaseFl) {
 		newInv = 1;
 
 	interfaceOff();
-	
+
 	while (newInv && (newInv <= _numInv)) {
 		if (_conditions->in(newInv) && !_inventory[newInv]._bitmapName.empty()) {
 			_nextFileName = getInvName(newInv);
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index 0a603f7691..62e1f75202 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -151,7 +151,7 @@ IntuiMessage *EventManager::getMsg() {
 			message._msgClass = kMessageButtonUp;
 			message._code = lastButtonHit->_buttonId;
 			message._qualifier = _keyPressed.flags;
-			
+
 			return &message;
 		} else
 			return nullptr;
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 68e6e63c1d..58b7e253f1 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -267,7 +267,7 @@ void LabEngine::doActions(const ActionList &actionList) {
 				// Puts a file into memory
 				_graphics->loadPict(action->_messages[0]);
 			break;
-		
+
 		case kActionLoadBitmap:
 			error("Unused opcode kActionLoadBitmap has been called");
 
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index 9cb35d1088..44d3caaf43 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -147,7 +147,7 @@ void Resource::readViews(uint16 roomNum) {
 Common::String Resource::translateFileName(const Common::String filename) {
 	Common::String upperFilename;
 
-	// The DOS and Windows version aren't looking for the right file, 
+	// The DOS and Windows version aren't looking for the right file,
 	if (!filename.compareToIgnoreCase("P:ZigInt/BLK") && (_vm->getPlatform() != Common::kPlatformAmiga))
 		upperFilename = "P:ZigInt/ZIGINT.BLK";
 	else
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 7c3cb39931..577384f99a 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -397,7 +397,7 @@ void LabEngine::processMonitor(const Common::String &ntext, TextFont *monitorFon
 					// Exit button
 					return;
 				}
-					
+
 				if (mouseX <= _utils->vgaScaleX(59)) {
 					// Back button
 					if (isInteractive) {
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index bae59f05cc..3452f44480 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -51,7 +51,7 @@ ScreenEffects::ScreenEffects(Screen *screen) : _screen(screen) {
 	vfxHeight = 0;
 
 	_fxPalette = new byte[768];
-	
+
 	_blendedPaletteStatus._active = false;
 	_blendedPaletteStatus._palette = _blendedPaletteStatus._newPalette = nullptr;
 	_blendedPaletteStatus._colorCount = 0;
diff --git a/engines/mads/camera.cpp b/engines/mads/camera.cpp
index c9b2f1429e..eb5942842a 100644
--- a/engines/mads/camera.cpp
+++ b/engines/mads/camera.cpp
@@ -148,7 +148,7 @@ bool Camera::camPan(int16 *picture_view, int16 *player_loc, int display_size, in
 
 			if (_direction < 0)
 				newTarget -= _distOffCenter;
-			else 
+			else
 				newTarget += _distOffCenter;
 
 			newTarget = MAX(0, newTarget);
diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 469aaedb81..e5c90768da 100644
--- a/engines/mads/conversations.cpp
+++ b/engines/mads/conversations.cpp
@@ -72,7 +72,7 @@ void GameConversations::load(int id) {
 	_conversations[slotIndex]._convId = id;
 
 	// Load the conversation data
-	Common::String cnvFilename = Common::String::format("CONV%03d.CNV", id);	
+	Common::String cnvFilename = Common::String::format("CONV%03d.CNV", id);
 	_conversations[slotIndex]._data.load(cnvFilename);
 
 	// Load the conversation's CND data
@@ -371,7 +371,7 @@ void GameConversations::update(bool flag) {
 			_personSpeaking = 0;
 			executeEntry(_verbId);
 			generateMessage(_runningConv->_cnd._messageList1, _runningConv->_cnd._messageList3);
-		
+
 			if (_heroTrigger && _popupVisible) {
 				_vm->_game->_scene._action._activeAction._verbId = _verbId;
 				_vm->_game->_trigger = _heroTrigger;
@@ -438,7 +438,7 @@ void GameConversations::generateMessage(Common::Array<int> &messageList, Common:
 
 	// Create the new text dialog
 	_dialog = new TextDialog(_vm, FONT_INTERFACE,
-		Common::Point(_popupX[_personSpeaking], _popupY[_personSpeaking]), 
+		Common::Point(_popupX[_personSpeaking], _popupY[_personSpeaking]),
 		portrait, _popupMaxLen[_personSpeaking]);
 
 	// Add in the lines
@@ -785,7 +785,7 @@ void ConversationConditionals::load(const Common::String &filename) {
 
 	// **** Section: Imports *************************************************
 	int streamNum = 1;
-	
+
 	_importVariables.resize(importsCount);
 	if (importsCount > 0) {
 		convFile = convFileUnpacked.getItemStream(streamNum++);
@@ -848,7 +848,7 @@ void DialogScript::load(Common::SeekableReadStream &s, uint startingOffset) {
 		instructionOffsets[startingOffset + s.pos()] = size();
 		push_back(ScriptEntry());
 		ScriptEntry &se = (*this)[size() - 1];
-		
+
 		// Load the instruction
 		se.load(s);
 	}
diff --git a/engines/mads/conversations.h b/engines/mads/conversations.h
index 7b7d3485ef..57e89964a5 100644
--- a/engines/mads/conversations.h
+++ b/engines/mads/conversations.h
@@ -172,7 +172,7 @@ struct ScriptEntry {
 
 	DialogCommand _command;
 	Conditional _conditionals[3];
-	
+
 	// Extra parameters for different opcodes
 	int _index;
 	Common::Array<int> _entries;
@@ -338,7 +338,7 @@ private:
 	int _personSpeaking;
 	TextDialog *_dialog;
 	bool _dialogAltFlag;
-	
+
 	/**
 	 * Returns the record for the specified conversation, if it's loaded
 	 */
@@ -435,7 +435,7 @@ public:
 	 * Set the hero trigger
 	 */
 	void setHeroTrigger(int val);
-	
+
 	/**
 	 * Set the interlocutor trigger
 	 */
@@ -473,7 +473,7 @@ public:
 	void exportValue(int val);
 
 	void reset(int id);
-	
+
 	/**
 	 * Handles updating the conversation display
 	 */
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index 8a0cc3575d..d44b5f2022 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -35,7 +35,7 @@ class MADSEngine;
 
 namespace Nebular {
 
-enum MADSGameAction { 
+enum MADSGameAction {
 	START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT,
 	SETS, EVOLVE
 };
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index 5f71c99a94..15dd44a4af 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -194,7 +194,7 @@ ASound::ASound(Audio::Mixer *mixer, OPL::OPL *opl, const Common::String &filenam
 		_channelData[i]._freqBase = 0;
 		_channelData[i]._field6 = 0;
 	}
-	
+
 	for (int i = 0; i < ADLIB_CHANNEL_COUNT; ++i)
 		_channels[i]._owner = this;
 
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 0940e79562..f1fe7eaf59 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -320,11 +320,11 @@ void Player::activateTrigger() {
 
 	_commandsAllowed |= _enableAtTarget;
 	_enableAtTarget = false;
-	
+
 	if (_walkTrigger) {
 		game._trigger = _walkTrigger;
 		game._triggerMode = SEQUENCE_TRIGGER_DAEMON;
-		
+
 		if (game._triggerMode != SEQUENCE_TRIGGER_DAEMON) {
 			action._activeAction = _walkTriggerAction;
 		}
diff --git a/engines/mads/screen.h b/engines/mads/screen.h
index eeb15453f8..15436942fe 100644
--- a/engines/mads/screen.h
+++ b/engines/mads/screen.h
@@ -254,7 +254,7 @@ public:
 	/**
 	 * Return the current drawing/clip area
 	 */
-	const Common::Rect getClipBounds() const { 
+	const Common::Rect getClipBounds() const {
 		const Common::Point pt = getOffsetFromOwner();
 		return Common::Rect(pt.x, pt.y, pt.x + this->w, pt.y + this->h);
 	}
diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 204f71fe43..adde5fc67c 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -339,7 +339,7 @@ UserInterface::UserInterface(MADSEngine *vm) : _vm(vm), _dirtyAreas(vm),
 	Common::fill(&_categoryIndexes[0], &_categoryIndexes[7], 0);
 
 	// Map the user interface to the bottom of the game's screen surface
-	create(*_vm->_screen, Common::Rect(0, MADS_SCENE_HEIGHT,  MADS_SCREEN_WIDTH, 
+	create(*_vm->_screen, Common::Rect(0, MADS_SCENE_HEIGHT,  MADS_SCREEN_WIDTH,
 		MADS_SCREEN_HEIGHT));
 
 	_surface.create(MADS_SCREEN_WIDTH, MADS_INTERFACE_HEIGHT);
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index 99db641948..443f2fb67e 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -81,7 +81,7 @@ public:
 	virtual void open() override;
 	virtual void reflowLayout() override;
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
-	
+
 	int getLoadSlot() const {return _loadSlot;}
 
 private:
@@ -92,7 +92,7 @@ private:
 
 	GUI::SaveLoadChooser *_loadDialog;
 	GUI::SaveLoadChooser *_saveDialog;
-	
+
 	int _loadSlot;
 
 	void save();
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 579e3792b3..6ee18d1576 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -3889,7 +3889,7 @@ bool LBMiniGameItem::togglePlaying(bool playing, bool restart) {
 	// Go back to the menu if requested, otherwise go to the requested page
 	if (returnToMenu)
 		_vm->addNotifyEvent(NotifyEvent(kLBNotifyGoToControls, 1));
-	else 
+	else
 		_vm->addNotifyEvent(NotifyEvent(kLBNotifyChangePage, destPage));
 
 	return false;
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index ffab55fa1f..f9ba6a42fa 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -3609,7 +3609,7 @@ void Myst::gullsFly2_run() {
 			VideoHandle handle = _vm->_video->playMovie(_vm->wrapMovieFilename(gulls[video], kMystStack));
 			if (!handle)
 				error("Failed to open gulls movie");
-	
+
 			handle->moveTo(424, 0);
 			_gullsNextTime = time + _vm->_rnd->getRandomNumber(16667) + 13334;
 		}
diff --git a/engines/mohawk/riven_sound.h b/engines/mohawk/riven_sound.h
index f673d1ee3f..c79ccc3e3a 100644
--- a/engines/mohawk/riven_sound.h
+++ b/engines/mohawk/riven_sound.h
@@ -70,7 +70,7 @@ public:
 
 	/**
 	 * Play an effect sound
-	 * 
+	 *
 	 * @param id Sound ID in the stack
 	 * @param volume Playback volume, between 0 and 255
 	 * @param playOnDraw Start playing when the current card is drawn instead of immediatly
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index d0edab9def..e2b09b6afd 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -346,7 +346,7 @@ private:
 	// Utility functions for managing entries
 	VideoEntryPtr open(uint16 id);
 	VideoEntryPtr open(const Common::String &fileName);
-	
+
 	VideoList::iterator findEntry(VideoEntryPtr ptr);
 	void removeEntry(VideoEntryPtr ptr);
 
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 97f219b46e..34109fff39 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -675,7 +675,7 @@ bool Console::cmdRegisters(int argc, const char **argv) {
 
 bool Console::parseResourceNumber36(const char *userParameter, uint16 &resourceNumber, uint32 &resourceTuple) {
 	int userParameterLen = strlen(userParameter);
-	
+
 	if (userParameterLen != 10) {
 		debugPrintf("Audio36/Sync36 resource numbers must be specified as RRRNNVVCCS\n");
 		debugPrintf("where RRR is the resource number/map\n");
@@ -760,7 +760,7 @@ void Console::cmdDiskDumpWorker(ResourceType resourceType, int resourceNumber, u
 	ResourceId resourceId;
 	Resource *resource = NULL;
 	char outFileName[50];
-	
+
 	switch (resourceType) {
 	case kResourceTypeAudio36:
 	case kResourceTypeSync36: {
@@ -877,7 +877,7 @@ bool Console::cmdList(int argc, const char **argv) {
 				currentMap = map;
 				displayCount = 0;
 			}
-			
+
 			if (displayCount % 3 == 0)
 				debugPrintf("  ");
 
@@ -2946,7 +2946,7 @@ bool Console::cmdScriptObjects(int argc, const char **argv) {
 		debugPrintf("<script number> may be * to show objects inside all loaded scripts\n");
 		return true;
 	}
-	
+
 	if (strcmp(argv[1], "*") == 0) {
 		// get said-strings of all currently loaded scripts
 		curScriptNr = -1;
@@ -2968,7 +2968,7 @@ bool Console::cmdScriptStrings(int argc, const char **argv) {
 		debugPrintf("<script number> may be * to show strings inside all loaded scripts\n");
 		return true;
 	}
-	
+
 	if (strcmp(argv[1], "*") == 0) {
 		// get strings of all currently loaded scripts
 		curScriptNr = -1;
@@ -2990,7 +2990,7 @@ bool Console::cmdScriptSaid(int argc, const char **argv) {
 		debugPrintf("<script number> may be * to show said-strings inside all loaded scripts\n");
 		return true;
 	}
-	
+
 	if (strcmp(argv[1], "*") == 0) {
 		// get said-strings of all currently loaded scripts
 		curScriptNr = -1;
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 256f312b4d..83f1d30916 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -805,7 +805,7 @@ SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int sl
 
 	if (in) {
 		SavegameMetadata meta;
-	
+
 		if (!get_savegame_metadata(in, &meta)) {
 			// invalid
 			delete in;
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 8dcafe0f38..c4aa4c5e46 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -73,7 +73,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 		g_debug_simulated_key = 0;
 		return make_reg(0, 1);
 	}
-	
+
 	curEvent = g_sci->getEventManager()->getSciEvent(mask);
 
 	if (s->_delayedRestoreGame) {
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index d375a27954..c605ba29e1 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -356,7 +356,7 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
 	}
 
 	textWidth = dest[3].toUint16(); textHeight = dest[2].toUint16();
-	
+
 	uint16 languageSplitter = 0;
 	Common::String splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter, sep);
 
@@ -832,7 +832,7 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
 
 	uint16 languageSplitter = 0;
 	Common::String splitText;
-	
+
 	switch (type) {
 	case SCI_CONTROLS_TYPE_BUTTON:
 	case SCI_CONTROLS_TYPE_TEXTEDIT:
@@ -1191,7 +1191,7 @@ reg_t kDisplay(EngineState *s, int argc, reg_t *argv) {
 		argc--; argc--; argv++; argv++;
 		text = g_sci->getKernel()->lookupText(textp, index);
 	}
-	
+
 	uint16 languageSplitter = 0;
 	Common::String splitText = g_sci->strSplitLanguage(text.c_str(), &languageSplitter);
 
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 2c54d2b78c..4773646b57 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1882,7 +1882,7 @@ static const uint16 kq7SignatureSubtitleFix3[] = {
 static const uint16 kq7PatchSubtitleFix3[] = {
 	PATCH_ADDTOOFFSET(+2),              // skip over "pToa initialized code"
 	0x2f, 0x0c,                         // bt [skip init code] - saved 1 byte
-	0x38, 
+	0x38,
 	PATCH_GETORIGINALBYTE(+6),
 	PATCH_GETORIGINALBYTE(+7),          // pushi (init)
 	0x76,                               // push0
@@ -3916,7 +3916,7 @@ static const uint16 qfg3PatchRoom750Bounds1[] = {
 static const uint16 qfg3SignatureRoom750Bounds2[] = {
 	// (ego x: 294 y: 39)
 	0x78,                               // push1 ("x")
-	0x78,                               // push1 
+	0x78,                               // push1
 	0x38, SIG_UINT16(294),              // pushi 294
 	0x76,                               // push0 ("y")
 	0x78,                               // push1
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 2af47801b2..6ecfbc7881 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -834,7 +834,7 @@ public:
 			}
 		}
 	}
-	
+
 	/**
 	 * Copies the string data held by this array into a new Common::String.
 	 */
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index cec402da7d..c23add1211 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -202,12 +202,12 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 	const byte *textPtr = (const byte *)str.c_str();
 	byte curChar = 0;
 	byte curChar2 = 0;
-	
+
 	while (1) {
 		curChar = *textPtr;
 		if (!curChar)
 			break;
-		
+
 		if ((curChar == '%') || (curChar == '#')) {
 			curChar2 = *(textPtr + 1);
 			foundLanguage = charToLanguage(curChar2);
@@ -236,7 +236,7 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 
 			while (1) {
 				curChar = *textPtr;
-				
+
 				switch (curChar) {
 				case 0: // Terminator NUL
 					return fullWidth;
@@ -257,7 +257,7 @@ Common::String SciEngine::getSciLanguageString(const Common::String &str, kLangu
 						continue;
 					}
 				}
-				
+
 				textPtr++;
 
 				mappedChar = s_halfWidthSJISMap[curChar];
diff --git a/engines/sci/graphics/font.h b/engines/sci/graphics/font.h
index 451261f315..b79fb2f0ba 100644
--- a/engines/sci/graphics/font.h
+++ b/engines/sci/graphics/font.h
@@ -75,7 +75,7 @@ private:
 		byte height;
 		int16 offset;
 	};
-	
+
 	byte _fontHeight;
 	uint16 _numChars;
 	Charinfo *_chars;
diff --git a/engines/sci/graphics/paint32.cpp b/engines/sci/graphics/paint32.cpp
index 049ffc8683..bf7c73623e 100644
--- a/engines/sci/graphics/paint32.cpp
+++ b/engines/sci/graphics/paint32.cpp
@@ -91,7 +91,7 @@ void GfxPaint32::plotter(int x, int y, int color, void *data) {
 	const uint16 bitmapWidth  = properties.bitmap->getWidth();
 	const uint16 bitmapHeight = properties.bitmap->getHeight();
 	const uint32 index = bitmapWidth * y + x;
-	
+
 	// Only draw the points in the bitmap, and ignore the rest. SSCI scripts
 	// can draw lines ending outside the visible area (e.g. negative coordinates)
 	if (x >= 0 && x < bitmapWidth && y >= 0 && y < bitmapHeight) {
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 0025b24476..75a885da57 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -1004,14 +1004,14 @@ void GfxPicture::vectorFloodFill(int16 x, int16 y, byte color, byte priority, by
 	int16 borderRight = curPort->rect.right + curPort->left - 1;
 	int16 borderBottom = curPort->rect.bottom + curPort->top - 1;
 	int16 curToLeft, curToRight, a_set, b_set;
-	
+
 	// Translate coordinates, if required (needed for Macintosh 480x300)
 	_screen->vectorAdjustCoordinate(&borderLeft, &borderTop);
 	_screen->vectorAdjustCoordinate(&borderRight, &borderBottom);
 	//return;
 
 	stack.push(p);
-	
+
 	while (stack.size()) {
 		p = stack.pop();
 		if ((matchedMask = _screen->vectorIsFillMatch(p.x, p.y, matchMask, searchColor, searchPriority, searchControl, isEGA)) == 0) // already filled
@@ -1239,7 +1239,7 @@ void GfxPicture::vectorPatternTexturedCircle(Common::Rect box, byte size, byte c
 	byte bitNo = 0;
 	const bool *textureData = &vectorPatternTextures[vectorPatternTextureOffset[texture]];
 	int y, x;
-	
+
 	for (y = box.top; y < box.bottom; y++) {
 		for (x = box.left; x < box.right; x++) {
 			if (bitmap & 1) {
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 601ab9f09f..23e92ef6a9 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -37,7 +37,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 
 	// Scale the screen, if needed
 	_upscaledHires = GFX_SCREEN_UPSCALED_DISABLED;
-	
+
 	// we default to scripts running at 320x200
 	_scriptWidth = 320;
 	_scriptHeight = 200;
@@ -45,7 +45,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	_height = 0;
 	_displayWidth = 0;
 	_displayHeight = 0;
-	
+
 	// King's Quest 6 and Gabriel Knight 1 have hires content, gk1/cd was able
 	// to provide that under DOS as well, but as gk1/floppy does support
 	// upscaled hires scriptswise, but doesn't actually have the hires content
@@ -58,7 +58,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	// Japanese versions of games use hi-res font on upscaled version of the game.
 	if ((g_sci->getLanguage() == Common::JA_JPN) && (getSciVersion() <= SCI_VERSION_1_1))
 		_upscaledHires = GFX_SCREEN_UPSCALED_640x400;
-	
+
 	// Macintosh SCI0 games used 480x300, while the scripts were running at 320x200
 	if (g_sci->getPlatform() == Common::kPlatformMacintosh) {
 		if (getSciVersion() <= SCI_VERSION_01) {
@@ -66,7 +66,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 			_width = 480;
 			_height = 300; // regular visual, priority and control map are 480x300 (this is different than other upscaled SCI games)
 		}
-	
+
 		// Some Mac SCI1/1.1 games only take up 190 rows and do not
 		// have the menu bar.
 		// TODO: Verify that LSL1 and LSL5 use height 190
@@ -145,7 +145,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	}
 
 	_displayPixels = _displayWidth * _displayHeight;
-	
+
 	// Allocate visual, priority, control and display screen
 	_visualScreen = (byte *)calloc(_pixels, 1);
 	_priorityScreen = (byte *)calloc(_pixels, 1);
@@ -314,7 +314,7 @@ void GfxScreen::vectorAdjustLineCoordinates(int16 *left, int16 *top, int16 *righ
 void GfxScreen::vectorPutLinePixel(int16 x, int16 y, byte drawMask, byte color, byte priority, byte control) {
 	if (_upscaledHires == GFX_SCREEN_UPSCALED_480x300) {
 		vectorPutLinePixel480x300(x, y, drawMask, color, priority, control);
-		return;		
+		return;
 	}
 
 	// For anything else forward to the regular putPixel
@@ -628,7 +628,7 @@ void GfxScreen::dither(bool addToFlag) {
 	byte color, ditheredColor;
 	byte *visualPtr = _visualScreen;
 	byte *displayPtr = _displayScreen;
-	
+
 	if (!_unditheringEnabled) {
 		// Do dithering on visual and display-screen
 		for (y = 0; y < _height; y++) {
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 65416252f6..63ee4ed09e 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -289,7 +289,7 @@ public:
 		default:
 			break;
 		}
-		
+
 		// For non-upscaled mode and 480x300 Mac put pixels directly
 		int offset = y * _width + x;
 
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index cb6e614657..b5dd9aee0b 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -83,7 +83,7 @@ void GfxText16::ClearChar(int16 chr) {
 }
 
 // This internal function gets called as soon as a '|' is found in a text. It
-// will process the encountered code and set new font/set color. 
+// will process the encountered code and set new font/set color.
 // Returns textcode character count.
 int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int16 orgPenColor, bool doingDrawing) {
 	const char *textCode = text;
@@ -179,7 +179,7 @@ static const uint16 text16_shiftJIS_punctuation_SCI01[] = {
 // return max # of chars to fit maxwidth with full words, does not include
 // breaking space
 //  Also adjusts text pointer to the new position for the caller
-// 
+//
 // Special cases in games:
 //  Laura Bow 2 - Credits in the game menu - all the text lines start with spaces (bug #5159)
 //                Act 6 Coroner questionaire - the text of all control buttons has trailing spaces
@@ -245,7 +245,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 			break;
 		}
 		tempWidth += _font->getCharWidth(curChar);
-		
+
 		// Width is too large? -> break out
 		if (tempWidth > maxWidth)
 			break;
diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h
index 2724d97347..eb39fb2513 100644
--- a/engines/sci/graphics/text16.h
+++ b/engines/sci/graphics/text16.h
@@ -64,7 +64,7 @@ public:
 	void Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) {
 		Box(text, 0, show, rect, alignment, fontId);
 	}
-	
+
 	void DrawString(const char *text);
 	void DrawStatus(const char *text);
 
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index b3e7926015..f09729a1ed 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -99,7 +99,7 @@ static const byte v0ActorTalk[25] = {
 	0x06, // Sandy (Cut-Scene)
 };
 
-static const byte v0WalkboxSlantedModifier[0x16] = { 
+static const byte v0WalkboxSlantedModifier[0x16] = {
 	0x00,0x01,0x02,0x03,0x03,0x04,0x05,0x06,
 	0x06,0x07,0x08,0x09,0x09,0x0A,0x0B,
 	0x0C,0x0C,0x0D,0x0E,0x0F,0x10,0x10
@@ -237,7 +237,7 @@ void Actor_v0::initActor(int mode) {
 	_costCommand = 0xFF;
 	_miscflags = 0;
 	_speaking = 0;
-	
+
 	_walkCountModulo = 0;
 	_newWalkBoxEntered = false;
 	_walkDirX = 0;
@@ -297,7 +297,7 @@ void Actor_v0::walkboxQueueReverse() {
 		return;
 
 	for (int i = 1; i < j && j >= 1 ; ++i, --j) {
-		
+
 		byte tmp = _walkboxQueue[i];
 
 		_walkboxQueue[i] = _walkboxQueue[j];
@@ -371,7 +371,7 @@ bool Actor_v0::walkBoxQueuePrepare() {
 			_walkboxQueue[--_walkboxQueueIndex] = kInvalidBox;
 
 			BoxFound = _walkboxQueue[_walkboxQueueIndex - 1];
-		} 
+		}
 
 	} while (_walkboxQueueIndex > 0);
 
@@ -616,7 +616,7 @@ bool Actor_v0::calcWalkDistances() {
 	if (!_walkXCountInc && !_walkYCountInc)
 		return true;
 
-	if (_walkXCountInc <= _walkYCountInc) 
+	if (_walkXCountInc <= _walkYCountInc)
 		_walkYCountGreaterThanXCount = 1;
 
 	// 2FCC
@@ -652,7 +652,7 @@ byte Actor_v0::actorWalkX() {
 		setActorFromTmp();
 
 		return 3;
-	} 
+	}
 	// 2EBF
 	if (_tmp_Dest.x == _CurrentWalkTo.x)
 		return 1;
@@ -679,7 +679,7 @@ byte Actor_v0::actorWalkY() {
 		// 2EF8
 		setActorFromTmp();
 		return 4;
-	} 
+	}
 	// 2EFE
 	if (_walkYCountInc != 0) {
 		if (_walkYCountInc == 0xFF) {
@@ -690,7 +690,7 @@ byte Actor_v0::actorWalkY() {
 	// 2F0D
 	if (_CurrentWalkTo.y == _tmp_Dest.y)
 		return 1;
-	
+
 	return 0;
 }
 
@@ -904,8 +904,8 @@ L2A33:;
 		}
 
 		directionUpdate();
-		
-		if (_moving & 0x80) 
+
+		if (_moving & 0x80)
 			return;
 
 		animateActor(newDirToOldDir(_facing));
@@ -913,7 +913,7 @@ L2A33:;
 	} else {
 		// 2A0A
 		if ((_moving & 0x7F) != 1) {
-			
+
 			if (_NewWalkTo == _pos)
 				return;
 		}
@@ -1025,7 +1025,7 @@ L2CA3:;
 				_moving &= 0xF0;
 				_moving |= A;
 			} else {
-				if (A == 4) 
+				if (A == 4)
 					stopActorMoving();
 			}
 
@@ -1061,7 +1061,7 @@ L2CA3:;
 				} else {
 					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*-1, V12_Y_MULTIPLIER*0, false);
 				}
-				
+
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
 				goto L2CA3;
@@ -1433,13 +1433,13 @@ void Actor::turnToDirection(int newdir) {
 
 	if (_vm->_game.version <= 6) {
 		_targetFacing = newdir;
-		
+
 		if (_vm->_game.version == 0) {
 			setDirection(newdir);
 			return;
 		}
 		_moving = MF_TURN;
-		
+
 	} else {
 		_moving &= ~MF_TURN;
 		if (newdir != _facing) {
@@ -1637,7 +1637,7 @@ AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
 
 	int16 A;
 	boxMask &= 0x7C;
-	if (boxMask == 0x0C) 
+	if (boxMask == 0x0C)
 		A = 2;
 	else {
 		if (boxMask != 0x08)
@@ -2114,7 +2114,7 @@ void ScummEngine::processActors() {
 		// comment further up in this method for some details.
 		if (a->_costume) {
 
-			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)... 
+			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)...
 			// doing it the other way with V0, causes animation glitches (when beginnning to walk, as the costume hasnt been updated).
 			// Updating the costume directly after 'walkActor' and again, after drawing... causes frame skipping
 			if (_game.version == 0) {
@@ -3476,7 +3476,7 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 
 		// valid costume command?
 		if (_costCommand != 0xFF) {
-			
+
 			// Do we have a walkbox queue?
 			if (_walkboxQueueIndex < 1) {
 				_costCommand = 0xFF;
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 96b46aa21a..139f798d83 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -262,7 +262,7 @@ ScummDiskImage::ScummDiskImage(const char *disk1, const char *disk2, GameSetting
 		_numGlobalObjects = 256;
 		_numRooms = 55;
 		_numCostumes = 25;
-		
+
 		if (_game.features & GF_DEMO) {
 			_numScripts = 55;
 			_numSounds = 40;
diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp
index c504ad4fe8..8e4b5c9cc7 100644
--- a/engines/scumm/he/logic/moonbase_logic.cpp
+++ b/engines/scumm/he/logic/moonbase_logic.cpp
@@ -446,7 +446,7 @@ int LogicHEmoonbase::op_net_get_session_player_count(int op, int numArgs, int32
 	return _vm1->_moonbase->_net->getSessionPlayerCount(args[0] - 1);
 }
 
-int LogicHEmoonbase::op_net_destroy_player(int op, int numArgs, int32 *args) {	
+int LogicHEmoonbase::op_net_destroy_player(int op, int numArgs, int32 *args) {
 	return _vm1->_moonbase->_net->destroyPlayer(args[0]);
 }
 
@@ -506,7 +506,7 @@ int LogicHEmoonbase::op_net_who_am_i(int op, int numArgs, int32 *args) {
 }
 
 int LogicHEmoonbase::op_net_set_provider_by_name(int op, int numArgs, int32 *args) {
-	// Parameter 1 is the provider name and 
+	// Parameter 1 is the provider name and
 	// Parameter 2 is the (optional) tcp/ip address
 	return _vm1->_moonbase->_net->setProviderByName(args[0], args[1]);
 }
diff --git a/engines/scumm/he/moonbase/net_main.h b/engines/scumm/he/moonbase/net_main.h
index 8350904fcd..dd8cce5937 100644
--- a/engines/scumm/he/moonbase/net_main.h
+++ b/engines/scumm/he/moonbase/net_main.h
@@ -72,7 +72,7 @@ public:
 	void getSessionName(int sessionNumber, char *buffer, int length);
 	int getSessionPlayerCount(int sessionNumber);
 	void getProviderName(int providerIndex, char *buffer, int length);
-	
+
 private:
 	//mostly getters
 
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index a922af1671..b2af816afe 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -1506,7 +1506,7 @@ void ScummEngine_v72he::getStringFromArray(int arrayNumber, char *buffer, int ma
 	// this is ARRAY_GetStringFromArray() from ARRAYS.cpp of SPUTM
 
 	// this function makes a C-string out of <arrayNumber> contents
-	
+
 	VAR(0) = arrayNumber; // it was 0 in original code, but I've seen ScummVM Moonbase code which uses VAR_U32_ARRAY_UNK
 
 	int i, ch;
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index 87dc132ff0..2e37e4de76 100644
--- a/engines/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
@@ -39,7 +39,7 @@ void ScummEngine_v2::readClassicIndexFile() {
 				_numSounds = 40;
 			} else {
 				_numScripts = 160;
-				_numSounds = 70; 
+				_numSounds = 70;
 			}
 
 		} else if (_game.platform == Common::kPlatformNES) {
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 609cbd1e89..7bacd847ac 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -641,7 +641,7 @@ void ScummEngine_v0::setMode(byte mode) {
 		// Note: do not change freeze state here
 		state = USERSTATE_SET_IFACE |
 			USERSTATE_SET_CURSOR;
-		
+
 		break;
 	case kModeKeypad:
 		if (_game.features & GF_DEMO) {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index fe936b550c..8bcbb70e97 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -905,7 +905,7 @@ void ScummEngine_v0::checkExecVerbs() {
 			}
 		}
 	}
-		
+
 	if (_drawDemo && _game.features & GF_DEMO) {
 		verbDemoMode();
 	}
diff --git a/engines/sherlock/animation.h b/engines/sherlock/animation.h
index f3c95d4027..24d2bc3c3c 100644
--- a/engines/sherlock/animation.h
+++ b/engines/sherlock/animation.h
@@ -57,7 +57,7 @@ public:
 	 * Load the prologue name array
 	 */
 	void setPrologueNames(const char *const *names, int count);
-	
+
 	/**
 	 * Load the prologue frame array
 	 */
@@ -67,7 +67,7 @@ public:
 	 * Load the title name array
 	 */
 	void setTitleNames(const char *const *names, int count);
-	
+
 	/**
 	 * Load the title frame array
 	 */
diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index 6cfee5d822..12ea1dbbdf 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -94,7 +94,7 @@ void Events::setCursor(CursorId cursorId) {
 void Events::setCursor(const Graphics::Surface &src, int hotspotX, int hotspotY) {
 	_cursorId = INVALID_CURSOR;
 	_hotspotPos = Common::Point(hotspotX, hotspotY);
-	
+
 	if (!IS_3DO) {
 		// PC 8-bit palettized
 		CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0xff);
@@ -400,7 +400,7 @@ bool Events::checkInput() {
 
 void Events::incWaitCounter() {
 	setCursor(WAIT);
-	++_waitCounter;		
+	++_waitCounter;
 }
 
 void Events::decWaitCounter() {
diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index dc7ecd521e..853591305d 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -140,7 +140,7 @@ void Fonts::setFont(int fontNum) {
 		_yOffsets[idx] = 0;
 
 		if (IS_ROSE_TATTOO) {
-			if ((idx >= 129 && idx < 135) || (idx >= 136 && idx < 143) || (idx >= 147 && idx < 155) || 
+			if ((idx >= 129 && idx < 135) || (idx >= 136 && idx < 143) || (idx >= 147 && idx < 155) ||
 					(idx >= 156 && idx < 165))
 				_yOffsets[idx] = 1;
 			else if ((idx >= 143 && idx < 146) || idx == 165)
diff --git a/engines/sherlock/fonts.h b/engines/sherlock/fonts.h
index 6c805447b3..1ee4cbd6eb 100644
--- a/engines/sherlock/fonts.h
+++ b/engines/sherlock/fonts.h
@@ -44,7 +44,7 @@ protected:
 	static int _widestChar;
 	static uint16 _charCount;
 
-	static void writeString(BaseSurface *surface, const Common::String &str, 
+	static void writeString(BaseSurface *surface, const Common::String &str,
 		const Common::Point &pt, int overrideColor = 0);
 
 	static inline byte translateChar(byte c);
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index da4aec6994..cef7157034 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -196,7 +196,7 @@ bool MidiParser_SH::loadMusic(byte *musData, uint32 musDataSize) {
 
 	_numTracks = 1;
 	_tracks[0] = pos;
-	
+
 	_ppqn = 1;
 	setTempo(16667);
 	setTrack(0);
diff --git a/engines/sherlock/music.h b/engines/sherlock/music.h
index b1eba1d889..5dc173c824 100644
--- a/engines/sherlock/music.h
+++ b/engines/sherlock/music.h
@@ -66,7 +66,7 @@ private:
 	Audio::SoundHandle _digitalMusicHandle;
 	MusicType _musicType;
 	byte *_midiMusicData;
-	
+
 	/**
 	 * Play the specified music resource
 	 */
@@ -100,7 +100,7 @@ public:
 	 * Start playing a song
 	 */
 	void startSong();
-	
+
 	/**
 	 * Free any currently loaded song
 	 */
@@ -110,7 +110,7 @@ public:
 	 * Stop playing the music
 	 */
 	void stopMusic();
-	
+
 	bool isPlaying();
 	uint32 getCurrentPosition();
 
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a05351b170..c7eee36544 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -267,7 +267,7 @@ void BaseObject::checkObject() {
 					break;
 				}
 				_frameNumber += 3;
-			
+
 			} else {
 				v -= 128;
 
@@ -306,7 +306,7 @@ void BaseObject::checkObject() {
 					}
 				} else if (IS_ROSE_TATTOO && v == 10) {
 					// Set delta for objects
-					_delta = Common::Point(READ_LE_UINT16(&_sequences[_frameNumber + 1]), 
+					_delta = Common::Point(READ_LE_UINT16(&_sequences[_frameNumber + 1]),
 						READ_LE_UINT16(&_sequences[_frameNumber + 3]));
 					_noShapeSize = Common::Point(0, 0);
 					_frameNumber += 4;
@@ -644,7 +644,7 @@ void Sprite::clear() {
 void Sprite::setImageFrame() {
 	int frameNum = MAX(_frameNumber, 0);
 	int imageNumber = _walkSequences[_sequenceNumber][frameNum];
-	
+
 	if (IS_SERRATED_SCALPEL)
 		imageNumber = imageNumber + _walkSequences[_sequenceNumber][0] - 2;
 	else if (imageNumber > _maxFrames)
@@ -1014,7 +1014,7 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	_oldPosition.y = s.readSint16LE();
 	_oldSize.x = s.readUint16LE();
 	_oldSize.y = s.readUint16LE();
-	
+
 	_goto.x = s.readSint16LE();
 	_goto.y = s.readSint16LE();
 	if (!isRoseTattoo) {
@@ -1113,7 +1113,7 @@ void Object::load3DO(Common::SeekableReadStream &s) {
 	_oldPosition.y = s.readSint16BE();
 	_oldSize.x = s.readUint16BE();
 	_oldSize.y = s.readUint16BE();
-	
+
 	_goto.x = s.readSint16BE();
 	_goto.y = s.readSint16BE();
 	_goto.x = _goto.x * FIXED_INT_MULTIPLIER / 100;
@@ -1485,7 +1485,7 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo, uint32 dataOf
 
 	_position.x = s.readSint16LE();
 	_position.y = s.readSint16LE();
-	
+
 	if (isRoseTattoo) {
 		_flags = s.readByte();
 		_scaleVal = s.readSint16LE();
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index 38b02aeae8..25ccddedbb 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -92,7 +92,7 @@ enum {
 #define GOTO_CODE 228
 #define TALK_SEQ_CODE 252		// Code specifying start of talk sequence frames in a Sequence
 #define TALK_LISTEN_CODE 251	// Code specifying start of talk listen frames in a Sequence
-#define ALLOW_TALK_CODE 250 
+#define ALLOW_TALK_CODE 250
 
 #define UPPER_LIMIT 0
 #define LOWER_LIMIT (IS_SERRATED_SCALPEL ? CONTROLS_Y : SHERLOCK_SCREEN_HEIGHT)
@@ -124,7 +124,7 @@ public:
 
 	PositionFacing() : Point32(), _facing(0) {}
 	PositionFacing(int xp, int yp, int theFacing) : Point32(xp, yp), _facing(theFacing) {}
-	PositionFacing &operator=(const Point32 &pt) { 
+	PositionFacing &operator=(const Point32 &pt) {
 		x = pt.x; y = pt.y;
 		return *this;
 	}
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 8057e26204..2b282c35b0 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -244,7 +244,7 @@ bool People::freeWalk() {
 		if (_data[idx]->_walkLoaded) {
 			delete _data[idx]->_images;
 			_data[idx]->_images = nullptr;
-			
+
 			_data[idx]->_walkLoaded = false;
 			result = true;
 		}
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index c47d45145a..41e298b2a9 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -168,10 +168,10 @@ public:
 	virtual const Common::Point restrictToZone(int zoneId, const Common::Point &destPos) = 0;
 
 	/**
-	 * If the specified speaker is a background object, it will set it so that it uses 
-	 * the Listen Sequence (specified by the sequence number). If the current sequence 
-	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object 
-	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code, 
+	 * If the specified speaker is a background object, it will set it so that it uses
+	 * the Listen Sequence (specified by the sequence number). If the current sequence
+	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object
+	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code,
 	 * the Listen Sequence will begin immediately.
 	 * @param speaker		Who is speaking
 	 * @param sequenceNum	Which listen sequence to use
diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp
index c4093048bd..ec7d60a1a2 100644
--- a/engines/sherlock/resources.cpp
+++ b/engines/sherlock/resources.cpp
@@ -119,7 +119,7 @@ void Resources::addToCache(const Common::String &filename) {
 	// Return immediately if the library has already been loaded
 	if (_indexes.contains(filename))
 		return;
-	
+
 	_cache.load(filename);
 
 	// Check to see if the file is a library
diff --git a/engines/sherlock/resources.h b/engines/sherlock/resources.h
index 99d58a51b1..72d5e907da 100644
--- a/engines/sherlock/resources.h
+++ b/engines/sherlock/resources.h
@@ -100,12 +100,12 @@ public:
 	 * loading its index for future use
 	 */
 	void addToCache(const Common::String &filename);
-	
+
 	/**
 	 * Adds a resource from a library file to the cache
 	 */
 	void addToCache(const Common::String &filename, const Common::String &libFilename);
-	
+
 	/**
 	 * Adds a given stream to the cache under the given name
 	 */
diff --git a/engines/sherlock/saveload.h b/engines/sherlock/saveload.h
index f4f3e7cfd9..9a26741172 100644
--- a/engines/sherlock/saveload.h
+++ b/engines/sherlock/saveload.h
@@ -133,7 +133,7 @@ public:
 	 * Load the game in the specified slot
 	 */
 	void loadGame(int slot);
-	
+
 	/**
 	 * Save the game in the specified slot with the given name
 	 */
diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp
index da0d16c145..bd2f44209f 100644
--- a/engines/sherlock/scalpel/3do/movie_decoder.cpp
+++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp
@@ -140,7 +140,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) {
 				_stream->readUint32BE(); // Unknown 0x00004000
 				_stream->readUint32BE(); // Unknown 0x00000000
 				_stream->readUint32BE(); // Unknown 0x00000010
-				audioSampleRate = _stream->readUint32BE();			
+				audioSampleRate = _stream->readUint32BE();
 				audioChannels = _stream->readUint32BE();
 				audioCodecTag = _stream->readUint32BE();
 				_stream->readUint32BE(); // Unknown 0x00000004 compression ratio?
diff --git a/engines/sherlock/scalpel/3do/scalpel_3do_screen.h b/engines/sherlock/scalpel/3do/scalpel_3do_screen.h
index 422f588b17..71674803ba 100644
--- a/engines/sherlock/scalpel/3do/scalpel_3do_screen.h
+++ b/engines/sherlock/scalpel/3do/scalpel_3do_screen.h
@@ -42,7 +42,7 @@ protected:
 	/**
 	 * Draws a surface at a given position within this surface with transparency
 	 */
-	virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, 
+	virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped,
 		int overrideColor);
 public:
 	Scalpel3DOScreen(SherlockEngine *vm);
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index cbb202095f..5050062938 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -507,7 +507,7 @@ bool ScalpelEngine::showAlleyCutscene() {
 	}
 
 	if (finished) {
-		// quick fade out 
+		// quick fade out
 		_screen->fadeToBlack(1);
 
 		// wait until after third "scream" in music happened
diff --git a/engines/sherlock/scalpel/scalpel_darts.cpp b/engines/sherlock/scalpel/scalpel_darts.cpp
index c5ba8032f3..1b7c266de7 100644
--- a/engines/sherlock/scalpel/scalpel_darts.cpp
+++ b/engines/sherlock/scalpel/scalpel_darts.cpp
@@ -408,7 +408,7 @@ int Darts::doPowerBar(const Common::Point &pt, byte color, int goToPower, bool i
 
 		if (!(idx % 8))
 			events.wait(1);
-	
+
 		++idx;
 	} while (!done);
 
diff --git a/engines/sherlock/scalpel/scalpel_darts.h b/engines/sherlock/scalpel/scalpel_darts.h
index 483a163510..24198a4052 100644
--- a/engines/sherlock/scalpel/scalpel_darts.h
+++ b/engines/sherlock/scalpel/scalpel_darts.h
@@ -53,7 +53,7 @@ private:
 	 * Initializes the variables needed for the dart game
 	 */
 	void initDarts();
-	
+
 	/**
 	 * Frees the images used by the dart game
 	 */
@@ -98,7 +98,7 @@ private:
 	 * Returns true if a mouse button or key is pressed.
 	 */
 	int dartHit();
-	
+
 	/**
 	 * Return the score of the given location on the dart-board
 	 */
diff --git a/engines/sherlock/scalpel/scalpel_people.h b/engines/sherlock/scalpel/scalpel_people.h
index 2ab6f5bc7d..1e29309d35 100644
--- a/engines/sherlock/scalpel/scalpel_people.h
+++ b/engines/sherlock/scalpel/scalpel_people.h
@@ -112,10 +112,10 @@ public:
 	virtual bool loadWalk();
 
 	/**
-	 * If the specified speaker is a background object, it will set it so that it uses 
-	 * the Listen Sequence (specified by the sequence number). If the current sequence 
-	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object 
-	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code, 
+	 * If the specified speaker is a background object, it will set it so that it uses
+	 * the Listen Sequence (specified by the sequence number). If the current sequence
+	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object
+	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code,
 	 * the Listen Sequence will begin immediately.
 	 * @param speaker		Who is speaking
 	 * @param sequenceNum	Which listen sequence to use
diff --git a/engines/sherlock/scalpel/scalpel_saveload.cpp b/engines/sherlock/scalpel/scalpel_saveload.cpp
index 90eab5930c..7098d47065 100644
--- a/engines/sherlock/scalpel/scalpel_saveload.cpp
+++ b/engines/sherlock/scalpel/scalpel_saveload.cpp
@@ -40,7 +40,7 @@ const int ENV_POINTS[6][3] = {
 
 /*----------------------------------------------------------------*/
 
-ScalpelSaveManager::ScalpelSaveManager(SherlockEngine *vm, const Common::String &target) : 
+ScalpelSaveManager::ScalpelSaveManager(SherlockEngine *vm, const Common::String &target) :
 	SaveManager(vm, target), _envMode(SAVEMODE_NONE) {
 
 	_fixedTextExit = FIXED(LoadSave_Exit);
@@ -262,14 +262,14 @@ bool ScalpelSaveManager::promptForDescription(int slot) {
 			xp -= screen.charWidth(saveName.lastChar());
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_FOREGROUND);
 			saveName.deleteLastChar();
-		
+
 		} else if (keyState.keycode == Common::KEYCODE_RETURN && saveName.compareToIgnoreCase(EMPTY_SAVEGAME_SLOT)) {
 			done = 1;
 
 		} else if (keyState.keycode == Common::KEYCODE_ESCAPE) {
 			screen.vgaBar(Common::Rect(xp, yp - 1, xp + 8, yp + 9), INV_BACKGROUND);
 			done = -1;
-		
+
 		} else if (keyState.ascii >= ' ' && keyState.ascii <= 'z' && saveName.size() < 50
 				&& (xp + screen.charWidth(keyState.ascii)) < 308) {
 			char c = (char)keyState.ascii;
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index ff38c07537..f1460fd01d 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -136,7 +136,7 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
 		(OpcodeMethod)&ScalpelTalk::cmdHolmesOn,
 		(OpcodeMethod)&ScalpelTalk::cmdGotoScene,
 		(OpcodeMethod)&ScalpelTalk::cmdPlayPrologue,
-		
+
 		(OpcodeMethod)&ScalpelTalk::cmdAddItemToInventory,
 		(OpcodeMethod)&ScalpelTalk::cmdSetObject,
 		(OpcodeMethod)&ScalpelTalk::cmdCallTalkFile,
@@ -147,7 +147,7 @@ ScalpelTalk::ScalpelTalk(SherlockEngine *vm) : Talk(vm) {
 		(OpcodeMethod)&ScalpelTalk::cmdRemoveItemFromInventory,
 		(OpcodeMethod)&ScalpelTalk::cmdEnableEndKey,
 		(OpcodeMethod)&ScalpelTalk::cmdDisableEndKey,
-		
+
 		(OpcodeMethod)&ScalpelTalk::cmdEndTextWindow,
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 		nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
@@ -387,7 +387,7 @@ OpcodeReturn ScalpelTalk::cmdClearInfoLine(const byte *&str) {
 
 OpcodeReturn ScalpelTalk::cmdClearWindow(const byte *&str) {
 	UserInterface &ui = *_vm->_ui;
-	
+
 	ui.clearWindow();
 	_yp = CONTROLS_Y + 12;
 	_charCount = _line = 0;
@@ -450,7 +450,7 @@ OpcodeReturn ScalpelTalk::cmdMoveMouse(const byte *&str) {
 	if (_talkToAbort)
 		return RET_EXIT;
 	str += 3;
-	
+
 	return RET_SUCCESS;
 }
 
@@ -650,7 +650,7 @@ bool ScalpelTalk::talk3DOMovieTrigger(int subIndex) {
 }
 
 Common::Point ScalpelTalk::get3doPortraitPosition() const {
-	// TODO: This current method is only an assumption of how the original figured 
+	// TODO: This current method is only an assumption of how the original figured
 	// out where to place each character's portrait movie.
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
@@ -672,7 +672,7 @@ Common::Point ScalpelTalk::get3doPortraitPosition() const {
 
 		pt = scene._bgShapes[objNum]._position;
 	}
-	
+
 	// Adjust the top-left so the center of the portrait will be on the character,
 	// but ensure the portrait will be entirely on-screen
 	pt -= Common::Point(PORTRAIT_W / 2, PORTRAIT_H / 2);
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index cc3aafff65..586f9ab000 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -105,38 +105,38 @@ private:
 	 * Handles input when the file list window is being displayed
 	 */
 	void doEnvControl();
-	
+
 	/**
 	 * Handle input whilst the inventory is active
 	 */
 	void doInvControl();
-	
+
 	/**
 	 * Handles waiting whilst an object's description window is open.
 	 */
 	void doLookControl();
-	
+
 	/**
 	 * Handles input until one of the user interface buttons/commands is selected
 	 */
 	void doMainControl();
-	
+
 	/**
 	 * Handles the input for the MOVE, OPEN, and CLOSE commands
 	 */
 	void doMiscControl(int allowed);
-	
+
 	/**
 	 * Handles input for picking up items
 	 */
 	void doPickControl();
-	
+
 	/**
 	 * Handles input when in talk mode. It highlights the buttons and available statements,
 	 * and handles allowing the user to click on them
 	 */
 	void doTalkControl();
-	
+
 	/**
 	 * Handles events when the Journal is active.
 	 * @remarks		Whilst this would in theory be better in the Journal class, since it displays in
@@ -150,7 +150,7 @@ private:
 	 */
 	void checkUseAction(const UseType *use, const Common::String &invName, FixedTextActionId fixedTextActionId,
 		int objNum, bool giveMode);
-	
+
 	/**
 	 * Print the previously selected object's decription
 	 */
@@ -212,7 +212,7 @@ public:
 
 	/**
 	 * Draw the user interface onto the screen's back buffers
-	 */	
+	 */
 	virtual void drawInterface(int bufferNum = 3);
 
 	/**
@@ -243,7 +243,7 @@ public:
 
 	/**
 	 * Print the previously selected object's decription
-	 */	
+	 */
 	virtual void printObjectDesc();
 };
 
diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index a885057f35..67959a19f9 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -181,7 +181,7 @@ void Object::setAnimMode(bool isAnimating) {
 }
 
 void Object::setDestination(const Common::Point &pt) {
-	_destination = pt; 
+	_destination = pt;
 
 	int moveRate = 10;
 	_walkStartFrame = _vm->_events->getFrameCounter();
@@ -215,7 +215,7 @@ void Object::setDestination(const Common::Point &pt) {
 
 void Object::erase() {
 	Screen &screen = *_vm->_screen;
-	
+
 	if (_visage.isLoaded() && !_oldBounds.isEmpty())
 		screen.SHblitFrom(screen._backBuffer1, Common::Point(_oldBounds.left, _oldBounds.top), _oldBounds);
 }
@@ -233,7 +233,7 @@ void Object::update() {
 				move();
 			}
 		}
-		
+
 		if (_isAnimating) {
 			if (_frame < _visage.getFrameCount())
 				_frame = changeFrame();
@@ -436,7 +436,7 @@ Logo::Logo(ScalpelEngine *vm) : _vm(vm), _lib("sf3.rlb") {
 	_animateFrameDelay = 0;
 	_animateFrames = NULL;
 	_animateFrame = 0;
-	
+
 	// Save a copy of the original palette
 	_vm->_screen->getPalette(_originalPalette);
 
@@ -630,7 +630,7 @@ void Logo::startAnimation(uint object, uint frameDelay, const AnimationFrame *fr
 
 void Logo::loadBackground() {
 	Screen &screen = *_vm->_screen;
-	
+
 	for (int idx = 0; idx < 4; ++idx) {
 		// Get the portion of the screen
 		Common::SeekableReadStream *stream = _lib.getResource(RES_BITMAP, 10, idx);
diff --git a/engines/sherlock/scalpel/tsage/logo.h b/engines/sherlock/scalpel/tsage/logo.h
index 8e47ea42a1..5a669da19a 100644
--- a/engines/sherlock/scalpel/tsage/logo.h
+++ b/engines/sherlock/scalpel/tsage/logo.h
@@ -79,7 +79,7 @@ public:
 	 * Get a frame from the visage
 	 */
 	void getFrame(ObjectSurface &s, int frameNum);
-	
+
 	/**
 	 * Return the number of frames
 	 */
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 78d0cd862c..b02569b26e 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -374,7 +374,7 @@ bool Scene::loadScene(const Common::String &filename) {
 				} else {
 					rrmStream->read(screen._backBuffer1.getPixels(), fullWidth * SHERLOCK_SCREEN_HEIGHT);
 				}
-			} 
+			}
 
 			// Read in the shapes header info
 			Common::Array<BgFileHeaderInfo> bgInfo;
@@ -528,7 +528,7 @@ bool Scene::loadScene(const Common::String &filename) {
 				delete[] cAnimOffsetTablePtr;
 			}
 
-			
+
 
 			// Read in the room bounding areas
 			int size = rrmStream->readUint16LE();
@@ -627,7 +627,7 @@ bool Scene::loadScene(const Common::String &filename) {
 			if (IS_ROSE_TATTOO) {
 				// Load the object sound list
 				char buffer[27];
-			
+
 				_objSoundList.resize(rrmStream->readUint16LE());
 				for (uint idx = 0; idx < _objSoundList.size(); ++idx) {
 					rrmStream->read(buffer, 27);
@@ -1205,9 +1205,9 @@ void Scene::transitionToScene() {
 		if (hSavedFacing < 8 && !saves._justLoaded) {
 			if (IS_ROSE_TATTOO)
 				hSavedFacing = Tattoo::FS_TRANS[hSavedFacing];
-			else			
+			else
 				hSavedFacing = Scalpel::FS_TRANS[hSavedFacing];
-			
+
 			hSavedPos.x *= FIXED_INT_MULTIPLIER;
 			hSavedPos.y *= FIXED_INT_MULTIPLIER;
 		}
@@ -1235,7 +1235,7 @@ void Scene::transitionToScene() {
 		people[HOLMES]._position = Common::Point(0, 0);
 	}
 
-	// If the scene is capable of scrolling, set the current scroll so that whoever has control 
+	// If the scene is capable of scrolling, set the current scroll so that whoever has control
 	// of the scroll code is in the middle of the screen
 	if (screen._backBuffer1.width() > SHERLOCK_SCREEN_WIDTH)
 		people[people._walkControl].centerScreenOnPerson();
@@ -1256,7 +1256,7 @@ void Scene::transitionToScene() {
 			}
 
 			if (Common::Rect(topLeft.x, topLeft.y, bottomRight.x, bottomRight.y).contains(
-					Common::Point(people[HOLMES]._position.x / FIXED_INT_MULTIPLIER, 
+					Common::Point(people[HOLMES]._position.x / FIXED_INT_MULTIPLIER,
 					people[HOLMES]._position.y / FIXED_INT_MULTIPLIER))) {
 				// Current point is already inside box - impact occurred on
 				// a previous call. So simply do nothing except talk until the
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index fb44c6dde2..d1ec1885c7 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -132,14 +132,14 @@ public:
 	 * Copy an image from the back buffer to the screen, taking care of both the
 	 * new area covered by the shape as well as the old area, which must be restored
 	 */
-	void flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp, 
+	void flushImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp,
 		int16 *width, int16 *height);
 
 	/**
 	 * Similar to flushImage, this method takes in an extra parameter for the scale proporation,
 	 * which affects the calculated bounds accordingly
 	 */
-	void flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp, 
+	void flushScaleImage(ImageFrame *frame, const Common::Point &pt, int16 *xp, int16 *yp,
 		int16 *width, int16 *height, int scaleVal);
 
 	/**
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index e5b1099123..0e5652d52c 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -72,7 +72,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 		_vm->_res->addToCache("TITLE.SND");
 	else {
 		_vm->_res->addToCache("MUSIC.LIB");
-		
+
 		if (IS_ROSE_TATTOO) {
 			_vm->_res->addToCache("SOUND.LIB");
 		} else {
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index a82aaf6730..2ca8d2d0e6 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -85,7 +85,7 @@ public:
 	 * Load a sound
 	 */
 	void loadSound(const Common::String &name, int priority);
-	
+
 	/**
 	 * Play the sound in the specified resource
 	 */
@@ -100,17 +100,17 @@ public:
 	 * Stop the AIFF sound that was started with playAiff().
 	 */
 	void stopAiff();
-	
+
 	/**
 	 * Play a previously loaded sound
 	 */
 	void playLoadedSound(int bufNum, WaitType waitType);
-	
+
 	/**
 	 * Free any previously loaded sounds
 	 */
 	void freeLoadedSounds();
-	
+
 	/**
 	 * Stop playing any active sound
 	 */
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 3c6bf44837..b4987f070a 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -172,7 +172,7 @@ void Talk::talkTo(const Common::String filename) {
 	// Turn on the Exit option
 	ui._endKeyActive = true;
 
-	if (people[HOLMES]._walkCount || (!people[HOLMES]._walkTo.empty() && 
+	if (people[HOLMES]._walkCount || (!people[HOLMES]._walkTo.empty() &&
 			(IS_SERRATED_SCALPEL || people._allowWalkAbort))) {
 		// Only interrupt if trying to do an action, and not just if player is walking around the scene
 		if (people._allowWalkAbort)
@@ -1195,7 +1195,7 @@ OpcodeReturn Talk::cmdWalkToCAnimation(const byte *&str) {
 	++str;
 	CAnim &animation = scene._cAnim[str[0] - 1];
 	people[HOLMES].walkToCoords(animation._goto[0], animation._goto[0]._facing);
-	
+
 	return _talkToAbort ? RET_EXIT : RET_SUCCESS;
 }
 
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 2c0da24d69..1fa015362b 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -71,7 +71,7 @@ enum {
 	OP_ENABLE_END_KEY			= 31,
 	OP_DISABLE_END_KEY			= 32,
 	OP_END_TEXT_WINDOW			= 33,
-	
+
 	OP_MOUSE_OFF_ON				= 34,
 	OP_SET_WALK_CONTROL			= 35,
 	OP_SET_TALK_SEQUENCE		= 36,
@@ -123,7 +123,7 @@ struct SequenceEntry {
 	short _frameNumber;		// Frame number in frame sequence to draw
 	short _sequenceNumber;	// Start frame of sequences that are repeated
 	int _seqStack;			// Allows gosubs to return to calling frame
-	int _seqTo;				// Allows 1-5, 8-3 type sequences encoded 
+	int _seqTo;				// Allows 1-5, 8-3 type sequences encoded
 	int _seqCounter;		// How many times this sequence has been executed
 	int _seqCounter2;
 
@@ -315,7 +315,7 @@ public:
 	 * saved onto the sequence stack.
 	 */
 	void pushSequence(int speaker);
-	
+
 	/**
 	 * Push the details of a passed object onto the saved sequences stack
 	 */
@@ -351,7 +351,7 @@ public:
 	 * Prints a single conversation option in the interface window
 	 */
 	virtual int talkLine(int lineNum, int stateNum, byte color, int lineY, bool slamIt) { return 0; }
-	
+
 	/**
 	 * Pulls a background object sequence from the sequence stack and restore's the
 	 * object's sequence
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 3131df7649..31a65783e3 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -63,7 +63,7 @@ void TattooEngine::initialize() {
 
 	// Add some more files to the cache
 	_res->addToCache("walk.lib");
-	
+
 	// Set up list of people
 	TattooFixedText &fixedText = *(TattooFixedText *)_fixedText;
 	const char *peopleNamePtr = nullptr;
@@ -122,7 +122,7 @@ void TattooEngine::startScene() {
 		// Darts Board minigame
 		_darts.playDarts(GAME_CRICKET);
 		break;
-	
+
 	case 102:
 		// Darts Board minigame
 		_darts.playDarts(GAME_301);
diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp
index cbc3ea1fe8..b3fa8cda9e 100644
--- a/engines/sherlock/tattoo/tattoo_darts.cpp
+++ b/engines/sherlock/tattoo/tattoo_darts.cpp
@@ -121,7 +121,7 @@ void Darts::playDarts(GameType gameType) {
 					numHits = 1;
 				if (numHits > 3)
 					numHits = 3;
-				
+
 				lastDart = lastDart & 0xffff;
 				updateCricketScore(playerNum, lastDart, numHits);
 				score = (playerNum == 0) ? _score1 : _score2;
@@ -134,7 +134,7 @@ void Darts::playDarts(GameType gameType) {
 				done = true;
 				playerNum = 0;
 			}
-				
+
 
 			if (_gameType == GAME_301) {
 				if (playerNum == 0)
@@ -217,7 +217,7 @@ void Darts::playDarts(GameType gameType) {
 			}
 
 			if (score != 0 && playerNum == 0 && !gameOver)
-				screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing * 3), 0, 
+				screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing * 3), 0,
 					"%s", FIXED(DartsPressKey));
 
 			if (gameOver) {
@@ -388,14 +388,14 @@ void Darts::showNames(int playerNum) {
 
 	color = playerNum == 0 ? PLAYER_COLOR : DART_COLOR_FORE;
 	screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y), 0, "%s", FIXED(DartsPlayerHolmes));
-	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1, 
+	screen._backBuffer1.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1,
 		STATUS_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color);
 	screen.fillRect(Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + _spacing + 1,
 		STATUS_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color);
 
 	color = playerNum == 1 ? PLAYER_COLOR : DART_COLOR_FORE;
 	screen.print(Common::Point(STATUS2_INFO_X, STATUS_INFO_Y), 0, "%s", _opponent.c_str());
-	screen._backBuffer1.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1, 
+	screen._backBuffer1.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1,
 		STATUS2_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color);
 	screen.fillRect(Common::Rect(STATUS2_INFO_X, STATUS_INFO_Y + _spacing + 1,
 		STATUS2_INFO_X + 50, STATUS_INFO_Y + _spacing + 3), color);
@@ -449,7 +449,7 @@ void Darts::showStatus(int playerNum) {
 	}
 
 	screen.SHblitFrom(screen._backBuffer1, Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 10),
-		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, STATUS_INFO_X + STATUS_INFO_WIDTH, 
+		Common::Rect(STATUS_INFO_X, STATUS_INFO_Y + 10, STATUS_INFO_X + STATUS_INFO_WIDTH,
 			STATUS_INFO_Y + STATUS_INFO_HEIGHT - 10));
 }
 
@@ -674,9 +674,9 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) {
 			screen.slamArea(drawPos.x, drawPos.y, xSize, ySize);
 			if (oldDrawPos.x != -1)
 				// Flush the erased dart area
-				screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize); 
+				screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize);
 
-			screen._backBuffer1.SHblitFrom(screen._backBuffer2, Common::Point(drawPos.x, drawPos.y), 
+			screen._backBuffer1.SHblitFrom(screen._backBuffer2, Common::Point(drawPos.x, drawPos.y),
 				Common::Rect(drawPos.x, drawPos.y, drawPos.x + xSize, drawPos.y + ySize));
 
 			oldDrawPos.x = drawPos.x;
@@ -745,7 +745,7 @@ void Darts::drawDartThrow(const Common::Point &dartPos, int computer) {
 			screen.slamArea(oldDrawPos.x, oldDrawPos.y, oldxSize, oldySize);
 
 		if (idx != 23)
-			screen._backBuffer1.SHblitFrom(screen._backBuffer2, drawPos, 
+			screen._backBuffer1.SHblitFrom(screen._backBuffer2, drawPos,
 				Common::Rect(drawPos.x, drawPos.y, drawPos.x + xSize, drawPos.y + ySize)); // erase dart
 
 		events.wait(1);
@@ -805,7 +805,7 @@ int Darts::findNumberOnBoard(int aim, Common::Point &pt) {
 			}
 		}
 	}
-	
+
 	pt = convertFromScreenToScoreCoords(pt);
 
 	if (aim == 3)
@@ -832,7 +832,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) {
 
 	if (_gameType == GAME_301) {
 		// Try to hit number
-		aim = score; 
+		aim = score;
 		if(score > 60)
 			shootBull = true;
 	} else {
@@ -855,7 +855,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) {
 		if (!cricketaimset) {
 			// Everything is closed
 			// just in case we don't get set in loop below, which should never happen
-			aim = 14;  
+			aim = 14;
 			for (int idx = 0; idx < 7; ++idx) {
 				if (_cricketScore[playerNum^1][idx] < 3) {
 					// Opponent has this open
@@ -896,7 +896,7 @@ void Darts::getComputerNumber(int playerNum, Common::Point &targetPos) {
 
 	// the higher the level, the more accurate the throw
 	int v = _vm->getRandomNumber(9);
-	v += _level * 2; 
+	v += _level * 2;
 
 	if (v <= 2) {
 		targetPos.x += _vm->getRandomNumber(70) - 35;
@@ -981,12 +981,12 @@ int Darts::throwDart(int dartNum, int computer) {
 
 	// Copy power bars to the secondary back buffer
 	screen._backBuffer2.SHblitFrom(screen._backBuffer1, Common::Point(DART_BAR_VX - 1, DART_HEIGHT_Y - 1),
-		Common::Rect(DART_BAR_VX - 1, DART_HEIGHT_Y - 1, DART_BAR_VX - 1 + 10, 
+		Common::Rect(DART_BAR_VX - 1, DART_HEIGHT_Y - 1, DART_BAR_VX - 1 + 10,
 		DART_HEIGHT_Y - 1 + DART_BAR_SIZE + 2));
 
 	Common::Point dartPos(DARTBOARD_TOTALLEFT + horiz*DARTBOARD_TOTALX / 100,
 		DARTBOARD_TOTALTOP + height * DARTBOARD_TOTALY / 100);
-	
+
 	dartPos.x += 2 - _vm->getRandomNumber(4);
 	dartPos.y += 2 - _vm->getRandomNumber(4);
 
diff --git a/engines/sherlock/tattoo/tattoo_darts.h b/engines/sherlock/tattoo/tattoo_darts.h
index ab6b1c8204..94402a5b1b 100644
--- a/engines/sherlock/tattoo/tattoo_darts.h
+++ b/engines/sherlock/tattoo/tattoo_darts.h
@@ -103,7 +103,7 @@ private:
 	int doPowerBar(const Common::Point &pt, byte color, int goToPower, int orientation);
 
 	/**
-	 * This is similar to doPowerBar, except it draws the player's hand moving across the 
+	 * This is similar to doPowerBar, except it draws the player's hand moving across the
 	 * bottom of the screen to indicate the positioning of the darts
 	 */
 	int drawHand(int goToPower, int computer);
diff --git a/engines/sherlock/tattoo/tattoo_inventory.h b/engines/sherlock/tattoo/tattoo_inventory.h
index a18324b785..0a46045d4b 100644
--- a/engines/sherlock/tattoo/tattoo_inventory.h
+++ b/engines/sherlock/tattoo/tattoo_inventory.h
@@ -38,7 +38,7 @@ public:
 	 * Load the list of names the inventory items correspond to, if not already loaded,
 	 * and then calls loadGraphics to load the associated graphics
 	 */
-	virtual void loadInv();	
+	virtual void loadInv();
 };
 
 } // End of namespace Tattoo
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp
index 23e8bd9739..e432c255d8 100644
--- a/engines/sherlock/tattoo/tattoo_map.cpp
+++ b/engines/sherlock/tattoo/tattoo_map.cpp
@@ -70,7 +70,7 @@ int TattooMap::show() {
 	}
 
 	if (music._musicOn) {
-		// See if Holmes or Watson is the active character	
+		// See if Holmes or Watson is the active character
 		Common::String song;
 		if (_vm->readFlags(FLAG_PLAYER_IS_HOLMES))
 			// Player is Holmes
@@ -86,7 +86,7 @@ int TattooMap::show() {
 	}
 
 	screen.initPaletteFade(1364485);
-	
+
 	// Load the custom mouse cursors for the map
 	ImageFile cursors("omouse.vgs");
 	events.setCursor(cursors[0]._frame);
@@ -298,7 +298,7 @@ void TattooMap::loadData() {
 void TattooMap::drawMapIcons() {
 	Debugger &debugger = *_vm->_debugger;
 	Screen &screen = *_vm->_screen;
-	
+
 	for (uint idx = 0; idx < _data.size(); ++idx) {
 		if (debugger._showAllLocations != LOC_DISABLED)
 			_vm->setFlagsDirect(idx + 1);
@@ -344,7 +344,7 @@ void TattooMap::checkMapNames(bool slamIt) {
 			const Common::String &desc = _data[_bgFound]._description;
 			_mapTooltip.setText(desc);
 		}
-	
+
 		_oldBgFound = _bgFound;
 	}
 
diff --git a/engines/sherlock/tattoo/tattoo_map.h b/engines/sherlock/tattoo/tattoo_map.h
index 1c7173bdb0..df3e3b3def 100644
--- a/engines/sherlock/tattoo/tattoo_map.h
+++ b/engines/sherlock/tattoo/tattoo_map.h
@@ -51,7 +51,7 @@ private:
 	int _bgFound, _oldBgFound;
 	WidgetMapTooltip _mapTooltip;
 	Common::Point _targetScroll;
-	
+
 	/**
 	 * Load data  needed for the map
 	 */
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 65cc283b66..fc3c2e6574 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -197,7 +197,7 @@ void TattooPerson::adjustSprite() {
 	// See if the player has come to a stop after clicking on an Arrow zone to leave the scene.
 	// If so, this will set up the exit information for the scene transition
 	if (!_walkCount && ui._exitZone != -1 && scene._walkedInScene && scene._goToScene == -1 &&
-			!_description.compareToIgnoreCase(people[HOLMES]._description)) { 
+			!_description.compareToIgnoreCase(people[HOLMES]._description)) {
 		Exit &exit = scene._exits[ui._exitZone];
 		scene._goToScene = exit._scene;
 
@@ -221,7 +221,7 @@ void TattooPerson::gotoStand() {
 	_walkCount = 0;
 	int oldFacing = _sequenceNumber;
 
-	// If the person was talking or listening, just return it to the standing sequence 
+	// If the person was talking or listening, just return it to the standing sequence
 	// in the direction they were pointing
 	if (_sequenceNumber >= TALK_UPRIGHT && _sequenceNumber <= LISTEN_UPLEFT) {
 		switch (_sequenceNumber) {
@@ -269,7 +269,7 @@ void TattooPerson::gotoStand() {
 		return;
 	}
 
-	// If the sprite that is stopping is an NPC and he is supposed to face a certain direction 
+	// If the sprite that is stopping is an NPC and he is supposed to face a certain direction
 	// when he stops, set that direction here
 	int npc = -1;
 	for (int idx = 1; idx < MAX_CHARACTERS; ++idx) {
@@ -317,7 +317,7 @@ void TattooPerson::gotoStand() {
 		}
 	}
 
-	// Only restart the frame number at 0 if the new sequence is different from the last sequence 
+	// Only restart the frame number at 0 if the new sequence is different from the last sequence
 	// so we don't let Holmes repeat standing.
 	if (_oldWalkSequence != -1) {
 		if (_seqTo) {
@@ -356,7 +356,7 @@ void TattooPerson::setWalking() {
 	Common::Point diagSpeed(MAX(WALK_SPEED_DIAG_X[scene._currentScene - 1] * SCALE_THRESHOLD / scaleVal, 2),
 		MAX((WALK_SPEED_Y[scene._currentScene - 1] - 2) * SCALE_THRESHOLD / scaleVal, 2));
 
-	// If the player is already close to the given destination that no walking is needed, 
+	// If the player is already close to the given destination that no walking is needed,
 	// move to the next  straight line segment in the overall walking route, if there is one
 	for (;;) {
 		if (_centerWalk || !_walkTo.empty()) {
@@ -505,7 +505,7 @@ void TattooPerson::setWalking() {
 	if (!_walkCount && _walkTo.empty())
 		gotoStand();
 
-	// If the sequence is the same as when we started, then Holmes was standing still and we're trying 
+	// If the sequence is the same as when we started, then Holmes was standing still and we're trying
 	// to re-stand him, so reset Holmes' rame to the old frame number from before it was reset to 0
 	if (_sequenceNumber == oldDirection)
 		_frameNumber = oldFrame;
@@ -536,7 +536,7 @@ void TattooPerson::walkToCoords(const Point32 &destPos, int destDir) {
 	_centerWalk = false;
 
 	// Only move the person if they're going an appreciable distance
-	if (ABS(_walkDest.x - (_position.x / FIXED_INT_MULTIPLIER)) > 8 || 
+	if (ABS(_walkDest.x - (_position.x / FIXED_INT_MULTIPLIER)) > 8 ||
 			ABS(_walkDest.y - (_position.y / FIXED_INT_MULTIPLIER)) > 4) {
 		goAllTheWay();
 
@@ -631,7 +631,7 @@ void TattooPerson::updateNPC() {
 
 		// Now see if we need to update the NPC's frame sequence so that he faces Holmes
 		if (_lookHolmes) {
-			// See where Holmes is with respect to the NPC (x coordinate)			
+			// See where Holmes is with respect to the NPC (x coordinate)
 			_npcFacing =  (people[HOLMES]._position.x < _position.x) ? STOP_LEFT : STOP_RIGHT;
 
 			// See where Holmes is with respect to the NPC (y coordinate)
@@ -643,7 +643,7 @@ void TattooPerson::updateNPC() {
 				_npcFacing = (_npcFacing == STOP_RIGHT) ? STOP_DOWNRIGHT : STOP_DOWNLEFT;
 			}
 
-			// See if we need to set the old_walk_sequence so the NPC will put his arms 
+			// See if we need to set the old_walk_sequence so the NPC will put his arms
 			// up if he turns another way
 			if (_sequenceNumber != _npcFacing)
 				_oldWalkSequence = _sequenceNumber;
@@ -660,7 +660,7 @@ void TattooPerson::updateNPC() {
 			if (!_npcPath[_npcIndex])
 				_npcIndex = 0;
 
-			// The NPC is stopped and any pause he was doing is done. We can now see what 
+			// The NPC is stopped and any pause he was doing is done. We can now see what
 			// the next command in the NPC path is.
 
 			// Scan Past any NPC Path Labels since they do nothing except mark places for If's and Goto's
@@ -725,7 +725,7 @@ void TattooPerson::updateNPC() {
 				}
 
 				case NPCPATH_TAKE_NOTES:
-					// Set the NPC to Pause where he is and set his frame sequences 
+					// Set the NPC to Pause where he is and set his frame sequences
 					// so he takes notes while he's paused
 					_npcPause = (_npcPath[_npcIndex + 1] - 1) * 256 + _npcPath[_npcIndex + 2] - 1;
 					_npcIndex += 3;
@@ -875,7 +875,7 @@ Common::Point TattooPerson::getSourcePoint() const {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	int scaleVal = scene.getScaleVal(_position);
 
-	return Common::Point(_position.x / FIXED_INT_MULTIPLIER + 
+	return Common::Point(_position.x / FIXED_INT_MULTIPLIER +
 		(_imageFrame ? _imageFrame->sDrawXSize(scaleVal) / 2 : 0), _position.y / FIXED_INT_MULTIPLIER);
 }
 
@@ -1028,7 +1028,7 @@ void TattooPerson::walkHolmesToNPC() {
 
 	// Clear the path variables
 	memset(_npcPath, 0, 100);
-	
+
 	// Set the NPC path so he pauses for 250 while looking at Holmes
 	_npcPath[0] = 6;
 	_npcPath[1] = 1;
@@ -1426,7 +1426,7 @@ bool TattooPeople::loadWalk() {
 
 			// Load the walk sequence data
 			Common::SeekableReadStream *stream = res.load(fname, _useWalkLib ? "walk.lib" : "vgs.lib");
-				
+
 			person._walkSequences.resize(stream->readByte());
 
 			for (uint seqNum = 0; seqNum < person._walkSequences.size(); ++seqNum)
diff --git a/engines/sherlock/tattoo/tattoo_people.h b/engines/sherlock/tattoo/tattoo_people.h
index c844d86e19..1517084c1c 100644
--- a/engines/sherlock/tattoo/tattoo_people.h
+++ b/engines/sherlock/tattoo/tattoo_people.h
@@ -64,7 +64,7 @@ enum TattooSequences {
 	TALK_UPLEFT		= 21,
 
 	// NPC Listen Sequence Numbers
-	LISTEN_UPRIGHT	= 22,      
+	LISTEN_UPRIGHT	= 22,
 	LISTEN_RIGHT		= 23,
 	LISTEN_DOWNRIGHT	= 24,
 	LISTEN_DOWNLEFT	= 25,
@@ -160,7 +160,7 @@ public:
 	 * This means that the index must be decremented by 3
 	 * 2) The NPC was in route to a position
 	 * He must be set to walk to that position again. This is done by moving the path index
-	 * so that it points to the code that set the NPC walking there in the first place. 
+	 * so that it points to the code that set the NPC walking there in the first place.
 	 * The regular calls to updateNPC will handle the rest
 	 */
 	void pullNPCPath();
@@ -262,10 +262,10 @@ public:
 	virtual const Common::Point restrictToZone(int zoneId, const Common::Point &destPos);
 
 	/**
-	 * If the specified speaker is a background object, it will set it so that it uses 
-	 * the Listen Sequence (specified by the sequence number). If the current sequence 
-	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object 
-	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code, 
+	 * If the specified speaker is a background object, it will set it so that it uses
+	 * the Listen Sequence (specified by the sequence number). If the current sequence
+	 * has an Allow Talk Code in it, the _gotoSeq field will be set so that the object
+	 * begins listening as soon as it hits the Allow Talk Code. If there is no Abort Code,
 	 * the Listen Sequence will begin immediately.
 	 * @param speaker		Who is speaking
 	 * @param sequenceNum	Which listen sequence to use
diff --git a/engines/sherlock/tattoo/tattoo_resources.cpp b/engines/sherlock/tattoo/tattoo_resources.cpp
index 4b73356d58..6247750911 100644
--- a/engines/sherlock/tattoo/tattoo_resources.cpp
+++ b/engines/sherlock/tattoo/tattoo_resources.cpp
@@ -27,7 +27,7 @@ namespace Sherlock {
 
 namespace Tattoo {
 
-const PeopleData PEOPLE_DATA[TATTOO_MAX_PEOPLE] = { 
+const PeopleData PEOPLE_DATA[TATTOO_MAX_PEOPLE] = {
 	{ "HOLM", kFixedText_People_SherlockHolmes },
 	{ "WATS", kFixedText_People_DrWatson },
 	{ "HUDS", kFixedText_People_MrsHudson },
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 00015cb189..628e8a3b7a 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -49,7 +49,7 @@ struct ShapeEntry {
 		_shape(nullptr), _person(person), _yp(yp), _isAnimation(false), _ordering(ordering) {}
 	ShapeEntry(Object *shape, int yp, int ordering) :
 		_shape(shape), _person(nullptr), _yp(yp), _isAnimation(false), _ordering(ordering) {}
-	ShapeEntry(int yp, int ordering) : 
+	ShapeEntry(int yp, int ordering) :
 		_shape(nullptr), _person(nullptr), _yp(yp), _isAnimation(true), _ordering(ordering) {}
 };
 typedef Common::List<ShapeEntry> ShapeList;
@@ -99,7 +99,7 @@ bool TattooScene::loadScene(const Common::String &filename) {
 
 	// If it's a new song, then start it up
 	if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) {
-		// WORKAROUND: Stop playing music after Diogenes fire scene in the intro, 
+		// WORKAROUND: Stop playing music after Diogenes fire scene in the intro,
 		// since it overlaps slightly into the next scene
 		if (talk._scriptName == "prol80p" && _currentScene == 80) {
 			music.stopMusic();
@@ -361,7 +361,7 @@ void TattooScene::doBgAnim() {
 		if (people[idx]._type == CHARACTER)
 			people[idx].checkSprite();
 	}
-	
+
 	for (uint idx = 0; idx < _bgShapes.size(); ++idx) {
 		if (_bgShapes[idx]._type == ACTIVE_BG_SHAPE)
 			_bgShapes[idx].checkObject();
@@ -539,10 +539,10 @@ void TattooScene::doBgAnimDrawSprites() {
 		if (obj._type == ACTIVE_BG_SHAPE || obj._type == REMOVE) {
 			if (_goToScene == -1) {
 				if (obj._scaleVal == SCALE_THRESHOLD)
-					screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, 
+					screen.flushImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
 					&obj._oldSize.x, &obj._oldSize.y);
 				else
-					screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y, 
+					screen.flushScaleImage(obj._imageFrame, obj._position, &obj._oldPosition.x, &obj._oldPosition.y,
 					&obj._oldSize.x, &obj._oldSize.y, obj._scaleVal);
 
 				if (obj._type == REMOVE)
@@ -595,7 +595,7 @@ int TattooScene::getScaleVal(const Point32 &pt) {
 		}
 	}
 
-	// If it wasn't found, we may be off screen to the left or right, so find the scale zone 
+	// If it wasn't found, we may be off screen to the left or right, so find the scale zone
 	// that would apply to the y val passed in disregarding the x
 	if (!found) {
 		for (uint idx = 0; idx < _scaleZones.size() && !found; ++idx) {
@@ -659,7 +659,7 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
 
 	if (ui._windowOpen)
 		ui.banishWindow();
-	
+
 	// Open up the room resource file and get the data for the animation
 	Common::SeekableReadStream *stream = res.load(_roomFilename);
 	stream->seek(44 + cAnimNum * 4);
@@ -768,7 +768,7 @@ int TattooScene::findBgShape(const Common::Point &pt) {
 	for (int idx = (int)_bgShapes.size() - 1; idx >= 0 && result == -1; --idx) {
 		Object &o = _bgShapes[idx];
 
-		if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN && 
+		if (o._type != INVALID && o._type != NO_SHAPE && o._type != HIDDEN &&
 				(o._aType <= PERSON || (ui._menuMode == LAB_MODE && o._aType == SOLID))) {
 			if (o.getNewBounds().contains(pt))
 				result = idx;
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index e6b9a9627e..8eda7368ea 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -34,7 +34,7 @@ namespace Tattoo {
 
 static const uint8 DIRECTION_CONVERSION[] = {
 	WALK_RIGHT, WALK_DOWN, WALK_LEFT, WALK_UP, STOP_RIGHT, STOP_DOWN, STOP_LEFT, STOP_UP,
-	WALK_UPRIGHT, WALK_DOWNRIGHT, WALK_UPLEFT, WALK_DOWNLEFT, STOP_UPRIGHT, STOP_UPLEFT, 
+	WALK_UPRIGHT, WALK_DOWNRIGHT, WALK_UPLEFT, WALK_DOWNLEFT, STOP_UPRIGHT, STOP_UPLEFT,
 	STOP_DOWNRIGHT, STOP_DOWNLEFT
 };
 
@@ -254,7 +254,7 @@ OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) {
 		return RET_EXIT;
 
 	ui.clearWindow();
-	
+
 	_yp = screen.fontHeight() + 11;
 	_charCount = _line = 0;
 
@@ -267,7 +267,7 @@ OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) {
 	return RET_SUCCESS;
 }
 
-OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) { 
+OpcodeReturn TattooTalk::cmdMouseOnOff(const byte *&str) {
 	Events &events = *_vm->_events;
 	bool mouseOn = *++str == 2;
 	if (mouseOn)
@@ -286,7 +286,7 @@ OpcodeReturn TattooTalk::cmdWalkHolmesToCoords(const byte *&str) {
 		// Negative X
 		xp = -1 * (xp - 16384);
 	int yp = (str[2] - 1) * 256 + str[3] - 1;
-	
+
 	people[HOLMES].walkToCoords(Point32(xp * FIXED_INT_MULTIPLIER, yp * FIXED_INT_MULTIPLIER),
 		DIRECTION_CONVERSION[str[4] - 1]);
 
@@ -352,7 +352,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelGoto(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -371,7 +371,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelIfFlagGoto(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -392,7 +392,7 @@ OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -413,7 +413,7 @@ OpcodeReturn TattooTalk::cmdPassword(const byte *&str) {
 	return RET_EXIT;
 }
 
-OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { 
+OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) {
 	Music &music = *_vm->_music;
 	Common::String currentSong = music._currentSongName;
 
@@ -498,7 +498,7 @@ OpcodeReturn TattooTalk::cmdSetNPCOff(const byte *&str) {
 	return RET_SUCCESS;
 }
 
-OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) { 
+OpcodeReturn TattooTalk::cmdSetNPCOn(const byte *&str) {
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	int npcNum = *++str;
 	people[npcNum]._type = CHARACTER;
@@ -510,7 +510,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathDest(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -532,7 +532,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPause(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -553,7 +553,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseTakingNotes(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -574,7 +574,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseLookingHolmes(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -600,7 +600,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) {
 	if (posX > 16384)
 		posX = -1 * (posX - 16384);
 	int posY = (str[2] - 1) * 256 + str[3] - 1;
-	
+
 	person._position = Point32(posX * FIXED_INT_MULTIPLIER, posY * FIXED_INT_MULTIPLIER);
 	if (person._seqTo && person._walkLoaded) {
 		person._walkSequences[person._sequenceNumber]._sequences[person._frameNumber] = person._seqTo;
@@ -637,7 +637,7 @@ OpcodeReturn TattooTalk::cmdSetNPCTalkFile(const byte *&str) {
 	int npcNum = *++str;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
-	
+
 	if (person._resetNPCPath) {
 		person._npcIndex = person._npcPause = 0;
 		person._resetNPCPath = false;
@@ -691,7 +691,7 @@ OpcodeReturn TattooTalk::cmdSetNPCVerbScript(const byte *&str) {
 	int verbNum = *++str - 1;
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	UseType &useType = people[npcNum]._use[verbNum];
-	
+
 	Common::String &name = useType._names[0];
 	name = "*C";
 
@@ -775,7 +775,7 @@ OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) {
 		people.setTalkSequence(speaker, sequenceNumber);
 	else
 		people.setListenSequence(speaker, sequenceNumber);
-	
+
 	str += 2;
 
 	return RET_SUCCESS;
@@ -785,7 +785,7 @@ OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) {
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	++str;
 	people._walkControl = str[0] - 1;
-	
+
 	return RET_SUCCESS;
 }
 
@@ -958,7 +958,7 @@ void TattooTalk::pullSequence(int slot) {
 		// Check for an entry in this slot
 		if (seq._obj) {
 			Object &o = *seq._obj;
-			
+
 			// See if we're not supposed to restore it until an Allow Talk Interrupt
 			if (slot == -1 && seq._obj->hasAborts()) {
 				seq._obj->_gotoSeq = -1;
diff --git a/engines/sherlock/tattoo/tattoo_talk.h b/engines/sherlock/tattoo/tattoo_talk.h
index 9b010513dc..b1e294725d 100644
--- a/engines/sherlock/tattoo/tattoo_talk.h
+++ b/engines/sherlock/tattoo/tattoo_talk.h
@@ -103,7 +103,7 @@ protected:
 public:
 	TattooTalk(SherlockEngine *vm);
 	virtual ~TattooTalk() {}
-	
+
 	/**
 	 * Called whenever a conversation or item script needs to be run. For standard conversations,
 	 * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 677a662535..1cb0220bba 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -42,7 +42,7 @@ bool WidgetList::contains(const WidgetBase *item) const {
 /*-------------------------------------------------------------------------*/
 
 TattooUserInterface::TattooUserInterface(SherlockEngine *vm): UserInterface(vm),
-		_inventoryWidget(vm), _messageWidget(vm), _textWidget(vm), _tooltipWidget(vm), 
+		_inventoryWidget(vm), _messageWidget(vm), _textWidget(vm), _tooltipWidget(vm),
 		_verbsWidget(vm), _creditsWidget(vm), _optionsWidget(vm), _quitWidget(vm) {
 	Common::fill(&_lookupTable[0], &_lookupTable[PALETTE_COUNT], 0);
 	Common::fill(&_lookupTable1[0], &_lookupTable1[PALETTE_COUNT], 0);
@@ -126,7 +126,7 @@ void TattooUserInterface::lookAtObject() {
 						name.deleteLastChar();
 
 					// See if this Object Sound List entry matches the object's name
-					if (!_bgShape->_name.compareToIgnoreCase(name)) {					
+					if (!_bgShape->_name.compareToIgnoreCase(name)) {
 						// Move forward to get the sound filename
 						while ((*p == ' ') || (*p == '='))
 							++p;
@@ -266,7 +266,7 @@ void TattooUserInterface::handleInput() {
 
 	if (_lockoutTimer)
 		--_lockoutTimer;
-	
+
 	// Key handling
 	if (events.kbHit()) {
 		_keyState = events.getKey();
@@ -416,7 +416,7 @@ void TattooUserInterface::doStandardControl() {
 		if (vm.readFlags(FLAG_PLAYER_IS_HOLMES)) {
 			freeMenu();
 			doJournal();
-			
+
 			// See if we're in a Lab Table Room
 			_menuMode = (scene._labTableScene) ? LAB_MODE : STD_MODE;
 			return;
@@ -573,7 +573,7 @@ void TattooUserInterface::displayObjectNames() {
 void TattooUserInterface::doInventory(int mode) {
 	People &people = *_vm->_people;
 	people[HOLMES].gotoStand();
-	
+
 	_inventoryWidget.load(mode);
 	_inventoryWidget.summonWindow();
 
@@ -661,7 +661,7 @@ void TattooUserInterface::putMessage(const char *formatStr, ...) {
 void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) {
 	Scene &scene = *_vm->_scene;
 
-	// This requires that there is a 16 grayscale palette sequence in the palette that goes from lighter 
+	// This requires that there is a 16 grayscale palette sequence in the palette that goes from lighter
 	// to darker as the palette numbers go up. The last palette entry in that run is specified by _bgColor
 	byte *p = &_lookupTable[0];
 	for (int idx = 0; idx < PALETTE_COUNT; ++idx)
@@ -693,7 +693,7 @@ void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) {
 				g = cMap[idx * 3 + 1] * 4 / 3;
 				b = cMap[idx * 3 + 2] * 4 / 3;
 				break;
-			
+
 			default:
 				r = g = b = 0;
 				break;
@@ -703,7 +703,7 @@ void TattooUserInterface::setupBGArea(const byte cMap[PALETTE_SIZE]) {
 			int cd = 99999;
 
 			for (int pal = 0; pal < PALETTE_COUNT; ++pal) {
-				int d = (r - cMap[pal * 3]) * (r - cMap[pal * 3]) + (g - cMap[pal * 3 + 1]) * (g - cMap[pal * 3 + 1]) + 
+				int d = (r - cMap[pal * 3]) * (r - cMap[pal * 3]) + (g - cMap[pal * 3 + 1]) * (g - cMap[pal * 3 + 1]) +
 					(b - cMap[pal * 3 + 2]) * (b - cMap[pal * 3 + 2]);
 
 				if (d < cd) {
@@ -722,12 +722,12 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 	People &people = *_vm->_people;
 	Scene &scene = *_vm->_scene;
 	Screen &screen = *_vm->_screen;
-	
+
 	static const int16 OFFSETS[16] = { -1, -2, -3, -3, -2, -1, -1, 0, 1, 2, 3, 3, 2, 1, 0, 0 };
 
 	if (_mask != nullptr) {
 		// Since a mask is active, restore the screen from the secondary back buffer prior to applying the mask
-		screen._backBuffer1.SHblitFrom(screen._backBuffer2, screen._currentScroll, Common::Rect(screen._currentScroll.x, 0, 
+		screen._backBuffer1.SHblitFrom(screen._backBuffer2, screen._currentScroll, Common::Rect(screen._currentScroll.x, 0,
 			screen._currentScroll.x + SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT));
 
 		switch (scene._currentScene) {
@@ -768,7 +768,7 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 	} else {
 		// Standard scene without mask, so call user interface to erase any UI elements as necessary
 		doBgAnimRestoreUI();
-		
+
 		// Restore background for any areas covered by characters and shapes
 		for (int idx = 0; idx < MAX_CHARACTERS; ++idx)
 			screen.restoreBackground(Common::Rect(people[idx]._oldPosition.x, people[idx]._oldPosition.y,
@@ -776,10 +776,10 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 
 		for (uint idx = 0; idx < scene._bgShapes.size(); ++idx) {
 			Object &obj = scene._bgShapes[idx];
-						
-			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) || 
+
+			if ((obj._type == ACTIVE_BG_SHAPE && (obj._maxFrames > 1 || obj._delta.x != 0 || obj._delta.y != 0)) ||
 					obj._type == HIDE_SHAPE || obj._type == REMOVE)
-				screen._backBuffer1.SHblitFrom(screen._backBuffer2, obj._oldPosition, 
+				screen._backBuffer1.SHblitFrom(screen._backBuffer2, obj._oldPosition,
 					Common::Rect(obj._oldPosition.x, obj._oldPosition.y, obj._oldPosition.x + obj._oldSize.x,
 						obj._oldPosition.y + obj._oldSize.y));
 		}
@@ -801,10 +801,10 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 	}
 
 	// Adjust the Target Scroll if needed
-	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) < 
+	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) <
 			(SHERLOCK_SCREEN_WIDTH / 8) && people[people._walkControl]._delta.x < 0) {
-		
-		_targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+
+		_targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER -
 				SHERLOCK_SCREEN_WIDTH / 8 - 250);
 		if (_targetScroll.x < 0)
 			_targetScroll.x = 0;
@@ -812,7 +812,7 @@ void TattooUserInterface::doBgAnimEraseBackground() {
 
 	if ((people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - screen._currentScroll.x) >
 			(SHERLOCK_SCREEN_WIDTH / 4 * 3)	&& people[people._walkControl]._delta.x > 0)
-		_targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER - 
+		_targetScroll.x = (short)(people[people._walkControl]._position.x / FIXED_INT_MULTIPLIER -
 			SHERLOCK_SCREEN_WIDTH / 4 * 3 + 250);
 
 	if (_targetScroll.x > _scrollSize)
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index d89da4a6da..28e41219bf 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -42,7 +42,7 @@ namespace Sherlock {
 namespace Tattoo {
 
 // Button width/height
-#define BUTTON_SIZE 15				
+#define BUTTON_SIZE 15
 // How long to play the intro before it can be skipped
 #define STARTUP_KEYS_DISABLED_DELAY 200
 
@@ -241,7 +241,7 @@ public:
 
 	/**
 	 * Draw the user interface onto the screen's back buffers
-	 */	
+	 */
 	virtual void drawInterface(int bufferNum = 3);
 
 	/**
diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp
index a35f4e5d74..eab8e3217a 100644
--- a/engines/sherlock/tattoo/widget_base.cpp
+++ b/engines/sherlock/tattoo/widget_base.cpp
@@ -106,7 +106,7 @@ void WidgetBase::draw() {
 	if (_bounds.width() > 0 && !_surface.empty()) {
 		// Get the area to draw, adjusted for scroll position
 		restrictToScreen();
-		
+
 		// Draw the background for the widget
 		drawBackground();
 
@@ -146,7 +146,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA
 		const char *lineStartP = strP;
 
 		// Find how many characters will fit on the next line
-		while (width < maxWidth && *strP && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] || 
+		while (width < maxWidth && *strP && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] ||
 				(byte)*strP == talk._opcodes[OP_NULL])) {
 			width += _surface.charWidth(*strP);
 
@@ -156,7 +156,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA
 			++strP;
 		}
 
-		// If the line was too wide to fit on a single line, go back to the last space 
+		// If the line was too wide to fit on a single line, go back to the last space
 		// if there was one, or otherwise simply break the line at this point
 		if (width >= maxWidth && spaceP != nullptr)
 			strP = spaceP;
@@ -167,7 +167,7 @@ Common::String WidgetBase::splitLines(const Common::String &str, Common::StringA
 		// Move the string ahead to the next line
 		if (*strP == ' ' || *strP == 13)
 			++strP;
-	} while (*strP && (lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER] 
+	} while (*strP && (lines.size() < maxLines) && ((byte)*strP < talk._opcodes[OP_SWITCH_SPEAKER]
 			|| (byte)*strP == talk._opcodes[OP_NULL]));
 
 	// Return any remaining text left over
@@ -266,7 +266,7 @@ void WidgetBase::drawScrollBar(int index, int pageSize, int count) {
 	// Draw the scroll position bar
 	int barHeight = (r.height() - BUTTON_SIZE * 2) * pageSize / count;
 	barHeight = CLIP(barHeight, BUTTON_SIZE, r.height() - BUTTON_SIZE * 2);
-	int barY = (count <= pageSize) ? r.top + BUTTON_SIZE : r.top + BUTTON_SIZE + 
+	int barY = (count <= pageSize) ? r.top + BUTTON_SIZE : r.top + BUTTON_SIZE +
 		(r.height() - BUTTON_SIZE * 2 - barHeight) * index / (count - pageSize);
 
 	_surface.fillRect(Common::Rect(r.left + 2, barY + 2, r.right - 2, barY + barHeight - 3), INFO_MIDDLE);
diff --git a/engines/sherlock/tattoo/widget_credits.cpp b/engines/sherlock/tattoo/widget_credits.cpp
index 1c878daaf6..fa1ac6fbae 100644
--- a/engines/sherlock/tattoo/widget_credits.cpp
+++ b/engines/sherlock/tattoo/widget_credits.cpp
@@ -49,7 +49,7 @@ void WidgetCredits::initCredits() {
 			const char *p = line.c_str() + 12;
 			while ((*p < '0') || (*p > '9'))
 				p++;
-			
+
 			_creditSpeed = atoi(p);
 		} else if (line.hasPrefix("Y Spacing")) {
 			const char *p = line.c_str() + 12;
@@ -73,7 +73,7 @@ void WidgetCredits::initCredits() {
 		if (p != nullptr && p[1] == '>') {
 			cl._line2 = Common::String(p + 3);
 			cl._line = Common::String(cl._line.c_str(), p);
-			
+
 			int width = cl._width;
 			int width1 = screen.stringWidth(cl._line);
 			int width2 = screen.stringWidth(cl._line2);
diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp
index 7666e81480..5e877c53f4 100644
--- a/engines/sherlock/tattoo/widget_files.cpp
+++ b/engines/sherlock/tattoo/widget_files.cpp
@@ -54,7 +54,7 @@ void WidgetFiles::show(SaveMode mode) {
 		createSavegameList();
 
 		// Set up the display area
-		_bounds = Common::Rect(SHERLOCK_SCREEN_WIDTH * 2 / 3, (_surface.fontHeight() + 1) * 
+		_bounds = Common::Rect(SHERLOCK_SCREEN_WIDTH * 2 / 3, (_surface.fontHeight() + 1) *
 			(FILES_LINES_COUNT + 1) + 17);
 		_bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2);
 
@@ -141,7 +141,7 @@ void WidgetFiles::render(FilesRenderMode mode) {
 
 	int xp = _surface.stringWidth("00.") + _surface.widestChar() + 5;
 	int yp = _surface.fontHeight() + 14;
-	
+
 	for (int idx = _savegameIndex; idx < (_savegameIndex + FILES_LINES_COUNT); ++idx) {
 		if (idx == _selector && mode != RENDER_ALL)
 			color = COMMAND_HIGHLIGHTED;
@@ -150,7 +150,7 @@ void WidgetFiles::render(FilesRenderMode mode) {
 
 		if (mode == RENDER_NAMES_AND_SCROLLBAR)
 			_surface.fillRect(Common::Rect(4, yp, _surface.width() - BUTTON_SIZE - 9, yp + _surface.fontHeight()), TRANSPARENCY);
-			
+
 		Common::String numStr = Common::String::format("%d.", idx + 1);
 		_surface.writeString(numStr, Common::Point(_surface.widestChar(), yp), color);
 		_surface.writeString(_savegames[idx], Common::Point(xp, yp), color);
@@ -170,7 +170,7 @@ void WidgetFiles::handleEvents() {
 	Common::KeyState keyState = ui._keyState;
 
 	// Handle scrollbar events
-	ScrollHighlight oldHighlight = ui._scrollHighlight;	
+	ScrollHighlight oldHighlight = ui._scrollHighlight;
 	handleScrollbarEvents(_savegameIndex, FILES_LINES_COUNT, _savegames.size());
 
 	int oldScrollIndex = _savegameIndex;
@@ -258,11 +258,11 @@ bool WidgetFiles::getFilename() {
 	assert(_selector != -1);
 	Common::Point pt(_surface.stringWidth("00.") + _surface.widestChar() + 5,
 		_surface.fontHeight() + 14 + (_selector - _savegameIndex) * (_surface.fontHeight() + 1));
-	
+
 	Common::String numStr = Common::String::format("%d.", _selector + 1);
 	_surface.writeString(numStr, Common::Point(_surface.widestChar(), pt.y), COMMAND_HIGHLIGHTED);
 
-	Common::String filename = _savegames[_selector];	
+	Common::String filename = _savegames[_selector];
 
 	if (isSlotEmpty(_selector)) {
 		index = 0;
@@ -328,7 +328,7 @@ bool WidgetFiles::getFilename() {
 			_surface.writeString(filename.c_str() + index, pt, COMMAND_HIGHLIGHTED);
 
 		} else if ((keyState.keycode == Common::KEYCODE_LEFT && index > 0)
-				|| (keyState.keycode == Common::KEYCODE_RIGHT && index < 49 && pt.x < (_bounds.right - BUTTON_SIZE - 20)) 
+				|| (keyState.keycode == Common::KEYCODE_RIGHT && index < 49 && pt.x < (_bounds.right - BUTTON_SIZE - 20))
 				|| (keyState.keycode == Common::KEYCODE_HOME && index > 0)
 				|| (keyState.keycode == Common::KEYCODE_END)) {
 			_surface.fillRect(Common::Rect(pt.x, pt.y, pt.x + width, pt.y + _surface.fontHeight()), TRANSPARENCY);
@@ -345,7 +345,7 @@ bool WidgetFiles::getFilename() {
 				pt.x += _surface.charWidth(filename[index]);
 				++index;
 				break;
-			
+
 			case Common::KEYCODE_HOME:
 				pt.x = _surface.stringWidth("00.") + _surface.widestChar() + 5;
 				index = 0;
@@ -376,7 +376,7 @@ bool WidgetFiles::getFilename() {
 
 			_surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.right - BUTTON_SIZE - 9, pt.y + _surface.fontHeight() - 1), TRANSPARENCY);
 			_surface.writeString(filename + index, pt, COMMAND_HIGHLIGHTED);
-		
+
 		} else  if (keyState.keycode == Common::KEYCODE_RETURN) {
 			done = 1;
 
@@ -393,7 +393,7 @@ bool WidgetFiles::getFilename() {
 				else
 					filename.setChar(keyState.ascii, index);
 
-				_surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.width() - BUTTON_SIZE - 9, 
+				_surface.fillRect(Common::Rect(pt.x, pt.y, _bounds.width() - BUTTON_SIZE - 9,
 					pt.y + _surface.fontHeight() - 1), TRANSPARENCY);
 				_surface.writeString(filename.c_str() + index, pt, COMMAND_HIGHLIGHTED);
 				pt.x += _surface.charWidth(keyState.ascii);
diff --git a/engines/sherlock/tattoo/widget_files.h b/engines/sherlock/tattoo/widget_files.h
index 87106f8edb..a4feb0d6dd 100644
--- a/engines/sherlock/tattoo/widget_files.h
+++ b/engines/sherlock/tattoo/widget_files.h
@@ -50,7 +50,7 @@ private:
 	 * Show the ScummVM Save Game dialog
 	 */
 	void showScummVMSaveDialog();
-	
+
 	/**
 	 * Show the ScummVM Load Game dialog
 	 */
diff --git a/engines/sherlock/tattoo/widget_foolscap.cpp b/engines/sherlock/tattoo/widget_foolscap.cpp
index 8225946838..f5afa56856 100644
--- a/engines/sherlock/tattoo/widget_foolscap.cpp
+++ b/engines/sherlock/tattoo/widget_foolscap.cpp
@@ -125,7 +125,7 @@ void WidgetFoolscap::show() {
 	// Show the window
 	summonWindow();
 	ui._menuMode = FOOLSCAP_MODE;
-} 
+}
 
 void WidgetFoolscap::handleEvents() {
 	Events &events = *_vm->_events;
diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 5e7238680a..24c32f6332 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -36,7 +36,7 @@ namespace Tattoo {
 #define MAX_INV_COMMANDS 10			// Maximum elements in dialog
 #define NUM_INV_PER_LINE 4			// Number of inentory items per line in the dialog
 
-WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInventory *owner) : 
+WidgetInventoryTooltip::WidgetInventoryTooltip(SherlockEngine *vm, WidgetInventory *owner) :
 		WidgetTooltipBase(vm), _owner(owner) {
 }
 
@@ -100,7 +100,7 @@ void WidgetInventoryTooltip::setText(const Common::String &str) {
 		_surface.writeFancyString(str, Common::Point(0, 0), BLACK, INFO_TOP);
 	} else {
 		int xp, yp;
-		
+
 		xp = (_bounds.width() - _surface.stringWidth(line1) - 2) / 2;
 		_surface.writeFancyString(line1, Common::Point(xp, 0), BLACK, INFO_TOP);
 
@@ -110,7 +110,7 @@ void WidgetInventoryTooltip::setText(const Common::String &str) {
 	}
 }
 
-void WidgetInventoryTooltip::handleEvents() {	
+void WidgetInventoryTooltip::handleEvents() {
 	Events &events = *_vm->_events;
 	FixedText &fixedText = *_vm->_fixedText;
 	Inventory &inv = *_vm->_inventory;
@@ -133,7 +133,7 @@ void WidgetInventoryTooltip::handleEvents() {
 	if (_owner->_invVerbMode == 3) {
 		select = ui._bgFound;
 		oldSelect = ui._oldBgFound;
-	
+
 		if (select != -1 && (select != oldSelect || (select != -1 && _surface.empty()))) {
 			// See if we're pointing at a shape or a sprite
 			if (select < 1000) {
@@ -143,17 +143,17 @@ void WidgetInventoryTooltip::handleEvents() {
 					if (_vm->getLanguage() == Common::GR_GRE) {
 
 						if (!_owner->_swapItems)
-							str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), obj._description.c_str(), 
+							str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), obj._description.c_str(),
 								inv[_owner->_invSelect]._name.c_str(), _owner->_verb.c_str());
 						else
-							str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), inv[_owner->_invSelect]._name.c_str(), 
+							str = Common::String::format("%s %s %s %s", _owner->_action.c_str(), inv[_owner->_invSelect]._name.c_str(),
 								obj._description.c_str(), _owner->_verb.c_str());
 					} else {
 						if (_owner->_swapItems)
-							str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), obj._description.c_str(), _owner->_action.c_str(), 
+							str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), obj._description.c_str(), _owner->_action.c_str(),
 								inv[_owner->_invSelect]._name.c_str());
 						else
-							str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), inv[_owner->_invSelect]._name.c_str(), 
+							str = Common::String::format("%s %s %s %s", _owner->_verb.c_str(), inv[_owner->_invSelect]._name.c_str(),
 								_owner->_action.c_str(), obj._description.c_str());
 					}
 				}
@@ -192,7 +192,7 @@ void WidgetInventoryTooltip::handleEvents() {
 				select = -1;
 			} else {
 				oldSelect = _owner->_invSelect;
-				
+
 				if (select != _owner->_invSelect || _surface.empty()) {
 
 					if (_owner->_invMode == 1) {
@@ -249,7 +249,7 @@ void WidgetInventoryTooltip::handleEvents() {
 
 /*----------------------------------------------------------------*/
 
-WidgetInventoryVerbs::WidgetInventoryVerbs(SherlockEngine *vm, WidgetInventory *owner) : 
+WidgetInventoryVerbs::WidgetInventoryVerbs(SherlockEngine *vm, WidgetInventory *owner) :
 		WidgetBase(vm), _owner(owner) {
 	_invVerbSelect = _oldInvVerbSelect = -1;
 }
@@ -472,7 +472,7 @@ void WidgetInventoryVerbs::highlightControls() {
 
 /*----------------------------------------------------------------*/
 
-WidgetInventory::WidgetInventory(SherlockEngine *vm) : WidgetBase(vm), 
+WidgetInventory::WidgetInventory(SherlockEngine *vm) : WidgetBase(vm),
 		_tooltipWidget(vm, this), _verbList(vm, this) {
 	_invMode = 0;
 	_invVerbMode = 0;
@@ -571,7 +571,7 @@ void WidgetInventory::drawInventory() {
 		}
 	}
 
-	drawScrollBar(inv._invIndex / NUM_INV_PER_LINE, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, 
+	drawScrollBar(inv._invIndex / NUM_INV_PER_LINE, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE,
 		(inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE);
 }
 
@@ -594,10 +594,10 @@ void WidgetInventory::handleEvents() {
 		int invIndex = inv._invIndex / NUM_INV_PER_LINE;
 
 		ScrollHighlight oldHighlight = ui._scrollHighlight;
-		handleScrollbarEvents(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, 
+		handleScrollbarEvents(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE,
 			(inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE);
 
-		handleScrolling(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE, 
+		handleScrolling(invIndex, NUM_INVENTORY_SHOWN / NUM_INV_PER_LINE,
 			(inv._holdings + NUM_INV_PER_LINE - 1) / NUM_INV_PER_LINE);
 
 		if (oldScrollIndex != invIndex) {
@@ -665,16 +665,16 @@ void WidgetInventory::handleEvents() {
 					ui.putMessage("%s", FIXED(NoEffect));
 			}
 		} else if ((_outsideMenu && !_bounds.contains(mousePos)) || ui._keyState.keycode == Common::KEYCODE_ESCAPE) {
-			// Want to close the window (clicked outside of it). So close the window and return to Standard 
+			// Want to close the window (clicked outside of it). So close the window and return to Standard
 			close();
 
 		} else if (_bounds.contains(mousePos)) {
 			// Mouse button was released inside the inventory window
 			_outsideMenu = false;
-		
+
 			//  See if they are pointing at one of the inventory items
 			if (_invSelect != -1) {
-				// See if they are in Use Obj with Inv. Mode (they right clicked on an item 
+				// See if they are in Use Obj with Inv. Mode (they right clicked on an item
 				// in the room and selected "Use with Inv.")
 				if (_invMode == 1) {
 					_tooltipWidget.banishWindow();
@@ -709,13 +709,13 @@ void WidgetInventory::handleEvents() {
 						_verbList._oldInvVerbSelect = -1;
 						_tooltipWidget.banishWindow();
 
-						// Keep track of the name of the inventory object so we can check it against the target fields 
+						// Keep track of the name of the inventory object so we can check it against the target fields
 						// of verbs when we activate it
 						_invTarget = inv[_invSelect]._name;
 						_swapItems = false;
 
 						_verbList.load();
-					} else {		
+					} else {
 						// They left clicked on an inventory item, so Look at it
 
 						// Check if they are looking at the solved Foolscap
@@ -726,7 +726,7 @@ void WidgetInventory::handleEvents() {
 
 							_invVerbMode = 0;
 							inv.freeInv();
-							
+
 							events.clearEvents();
 							events.setCursor(ARROW);
 							ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE;
diff --git a/engines/sherlock/tattoo/widget_lab.cpp b/engines/sherlock/tattoo/widget_lab.cpp
index eb32e2e22c..5e6b88df9d 100644
--- a/engines/sherlock/tattoo/widget_lab.cpp
+++ b/engines/sherlock/tattoo/widget_lab.cpp
@@ -93,7 +93,7 @@ void WidgetLab::handleEvents() {
 			// Show the command list for this object
 			ui._verbsWidget.load(!noDesc);
 		} else if (!noDesc) {
-			// The player has released on an object, see if they had an object selected 
+			// The player has released on an object, see if they had an object selected
 			// that will be used with this new object
 			if (_labObject) {
 				// See if the dragged object can be used with the new object
@@ -150,7 +150,7 @@ void WidgetLab::handleEvents() {
 
 				// Set the mouse cursor to the object
 				Graphics::Surface &img = _labObject->_imageFrame->_frame;
-				Common::Point cursorOffset = mousePos - _labObject->_position;					
+				Common::Point cursorOffset = mousePos - _labObject->_position;
 				events.setCursor(ARROW, cursorOffset, img);
 				ui._tooltipWidget._offsetY = cursorOffset.y;
 
diff --git a/engines/sherlock/tattoo/widget_options.cpp b/engines/sherlock/tattoo/widget_options.cpp
index 81f50f3bc5..35f1f267dc 100644
--- a/engines/sherlock/tattoo/widget_options.cpp
+++ b/engines/sherlock/tattoo/widget_options.cpp
@@ -192,7 +192,7 @@ void WidgetOptions::handleEvents() {
 			render(OP_NAMES);
 			vm.saveConfig();
 			break;
-			
+
 		case 7:
 			// Toggle Text Windows
 			vm._textWindowsOn = !vm._textWindowsOn;
@@ -230,7 +230,7 @@ void WidgetOptions::handleEvents() {
 		default:
 			break;
 		}
-		
+
 		_oldSelector = -1;
 	}
 }
@@ -302,17 +302,17 @@ void WidgetOptions::render(OptionRenderMode mode) {
 				int num = (_surface.fontHeight() + 4) & 0xfe;
 				int sliderY = yp + num / 2 - 8;
 
-				_surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, 
+				_surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5,
 					sliderY - (num - 6) / 2 + num - 1), TRANSPARENCY);
-				_surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, 
+				_surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2,
 					_surface.width() - _surface.widestChar() - 1, sliderY + 3), INFO_MIDDLE);
 				drawDialogRect(Common::Rect(_surface.widestChar(), sliderY, _surface.width() - _surface.widestChar(), sliderY + 6));
-				
-				_surface.fillRect(Common::Rect(_midiSliderX - 1, sliderY - (num - 6) / 2 + 2, 
+
+				_surface.fillRect(Common::Rect(_midiSliderX - 1, sliderY - (num - 6) / 2 + 2,
 					_midiSliderX + 1, sliderY - (num - 6) / 2 + num - 3), INFO_MIDDLE);
-				drawDialogRect(Common::Rect(_midiSliderX - 3, sliderY - (num - 6) / 2, 
+				drawDialogRect(Common::Rect(_midiSliderX - 3, sliderY - (num - 6) / 2,
 					_midiSliderX + 4, sliderY - (num - 6) / 2 + num));
-	
+
 				if (_midiSliderX - 4 > _surface.widestChar())
 					_surface.fillRect(Common::Rect(_midiSliderX - 4, sliderY, _midiSliderX - 4, sliderY + 4), INFO_BOTTOM);
 				if (_midiSliderX + 4 < _surface.width() - _surface.widestChar())
@@ -332,14 +332,14 @@ void WidgetOptions::render(OptionRenderMode mode) {
 				int num = (_surface.fontHeight() + 4) & 0xfe;
 				int sliderY = yp + num / 2 - 8;
 
-				_surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5, 
+				_surface.fillRect(Common::Rect(4, sliderY - (num - 6) / 2, _surface.width() - 5,
 					sliderY - (num - 6) / 2 + num - 1), TRANSPARENCY);
-				_surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, _surface.width() - _surface.widestChar() - 1, 
+				_surface.fillRect(Common::Rect(_surface.widestChar(), sliderY + 2, _surface.width() - _surface.widestChar() - 1,
 					sliderY + 3), INFO_MIDDLE);
 				drawDialogRect(Common::Rect(_surface.widestChar(), sliderY, _surface.width() - _surface.widestChar(), sliderY + 6));
-				_surface.fillRect(Common::Rect(_digiSliderX - 1, sliderY - (num - 6) / 2 + 2, _digiSliderX + 1, 
+				_surface.fillRect(Common::Rect(_digiSliderX - 1, sliderY - (num - 6) / 2 + 2, _digiSliderX + 1,
 					sliderY - (num - 6) / 2 + num - 3), INFO_MIDDLE);
-				drawDialogRect(Common::Rect(_digiSliderX - 3, sliderY - (num - 6) / 2, _digiSliderX + 4, 
+				drawDialogRect(Common::Rect(_digiSliderX - 3, sliderY - (num - 6) / 2, _digiSliderX + 4,
 					sliderY - (num - 6) / 2 + num));
 				if (_digiSliderX - 4 > _surface.widestChar())
 					_surface.fillRect(Common::Rect(_digiSliderX - 4, sliderY, _digiSliderX - 4, sliderY + 4), INFO_BOTTOM);
diff --git a/engines/sherlock/tattoo/widget_password.cpp b/engines/sherlock/tattoo/widget_password.cpp
index 2a2921026d..90e67729c5 100644
--- a/engines/sherlock/tattoo/widget_password.cpp
+++ b/engines/sherlock/tattoo/widget_password.cpp
@@ -119,7 +119,7 @@ void WidgetPassword::handleEvents() {
 		_surface.fillRect(Common::Rect(_cursorPos.x, _cursorPos.y, _cursorPos.x + width, _cursorPos.y + _surface.fontHeight()), TRANSPARENCY);
 		if (currentChar != ' ')
 			_surface.writeString(Common::String::format("%c", _password[_index]), _cursorPos, COMMAND_HIGHLIGHTED);
-		
+
 		switch (keycode) {
 		case Common::KEYCODE_LEFT:
 			_cursorPos.x -= _surface.charWidth(_password[_index - 1]);
@@ -136,7 +136,7 @@ void WidgetPassword::handleEvents() {
 		case Common::KEYCODE_END:
 			_cursorPos.x = _surface.stringWidth(_password) + _surface.widestChar();
 			_index = _password.size();
-			
+
 			while (_index > 0 && _password[_index - 1] == ' ') {
 				_cursorPos.x -= _surface.charWidth(_password[_index - 1]);
 				--_index;
@@ -187,7 +187,7 @@ void WidgetPassword::handleEvents() {
 
 void WidgetPassword::close() {
 	Talk &talk = *_vm->_talk;
-	
+
 	banishWindow();
 	if (talk._talkToAbort)
 		return;
diff --git a/engines/sherlock/tattoo/widget_quit.cpp b/engines/sherlock/tattoo/widget_quit.cpp
index ea8f2e080c..92fabc49bf 100644
--- a/engines/sherlock/tattoo/widget_quit.cpp
+++ b/engines/sherlock/tattoo/widget_quit.cpp
@@ -130,7 +130,7 @@ void WidgetQuit::handleEvents() {
 		byte color = (_select == 1) ? COMMAND_HIGHLIGHTED : INFO_TOP;
 		int yp = (_surface.fontHeight() + 4) * 2 + 8;
 		_surface.writeString(FIXED(Yes), Common::Point((_surface.width() - _surface.stringWidth(FIXED(Yes))) / 2, yp), color);
-		
+
 		color = (_select == 0) ? COMMAND_HIGHLIGHTED : INFO_TOP;
 		yp += (_surface.fontHeight() + 7);
 		_surface.writeString(FIXED(No), Common::Point((_surface.width() - _surface.stringWidth(FIXED(No))) / 2, yp), color);
diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp
index aec664561e..4a5b7f7dc7 100644
--- a/engines/sherlock/tattoo/widget_talk.cpp
+++ b/engines/sherlock/tattoo/widget_talk.cpp
@@ -133,7 +133,7 @@ void WidgetTalk::handleEvents() {
 	// Flag if they started pressing outside of the window
 	if (events._firstPress && !_bounds.contains(mousePos))
 		_outsideMenu = true;
-		
+
 	// Check for which statement they are pointing at
 	_selector = -1;
 	if (ui._scrollHighlight == SH_NONE) {
@@ -159,7 +159,7 @@ void WidgetTalk::handleEvents() {
 	if (keycode == Common::KEYCODE_TAB && ui._scrollHighlight == SH_NONE) {
 		if (_selector == -1) {
 			_selector = _statementLines[_scroll ? _talkScrollIndex : 0]._num;
-			
+
 			events.warpMouse(Common::Point(_bounds.right - BUTTON_SIZE - 10, _bounds.top + _surface.fontHeight() + 2));
 		} else {
 			if (ui._keyState.flags & Common::KBD_SHIFT) {
@@ -275,7 +275,7 @@ void WidgetTalk::handleEvents() {
 			do {
 				talk._scriptSelect = _selector;
 				talk._speaker = talk._talkTo;
-				
+
 				// Make a copy of the reply (since talkTo can reload the statements list), and call talkTo
 				Common::String reply = talk._statements[_selector]._reply;
 				talk.doScript(reply);
@@ -430,7 +430,7 @@ void WidgetTalk::setStatementLines() {
 			++numStatements;
 	}
 
-	// If there are more lines than can be displayed in the interface window at one time, adjust the allowed 
+	// If there are more lines than can be displayed in the interface window at one time, adjust the allowed
 	// width to take into account needing a scrollbar
 	int xSize = _scroll ? _bounds.width() - BUTTON_SIZE - 3 : _bounds.width();
 
diff --git a/engines/sherlock/tattoo/widget_text.cpp b/engines/sherlock/tattoo/widget_text.cpp
index a29cd2700f..b9653e371a 100644
--- a/engines/sherlock/tattoo/widget_text.cpp
+++ b/engines/sherlock/tattoo/widget_text.cpp
@@ -56,14 +56,14 @@ void WidgetText::load(const Common::String &str, int speaker) {
 	// See if it's only a single line long
 	if (height == _surface.fontHeight() + 10) {
 		width = _surface.widestChar() * 2 + 6;
-			
+
 		const char *strP = str.c_str();
 		while (*strP && (*strP < talk._opcodes[OP_SWITCH_SPEAKER] || *strP == talk._opcodes[OP_NULL]))
 			width += _surface.charWidth(*strP++);
 	}
 
 	_bounds = Common::Rect(width, height);
-		
+
 	if (speaker == -1) {
 		// No speaker specified, so center window on look position
 		_bounds.translate(ui._lookPos.x - width / 2, ui._lookPos.y - height / 2);
@@ -89,11 +89,11 @@ void WidgetText::centerWindowOnSpeaker(int speaker) {
 		int scaleVal = scene.getScaleVal(people[HOLMES]._position);
 		if (scaleVal == SCALE_THRESHOLD) {
 			pt.x += people[HOLMES].frameWidth() / 2;
-			pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES].frameHeight() 
+			pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES].frameHeight()
 				- _bounds.height() - _surface.fontHeight();
 		} else {
 			pt.x += people[HOLMES]._imageFrame->sDrawXSize(scaleVal) / 2;
-			pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES]._imageFrame->sDrawYSize(scaleVal) 
+			pt.y = people[HOLMES]._position.y / FIXED_INT_MULTIPLIER - people[HOLMES]._imageFrame->sDrawYSize(scaleVal)
 				- _bounds.height() - _surface.fontHeight();
 		}
 	} else {
diff --git a/engines/sherlock/tattoo/widget_tooltip.cpp b/engines/sherlock/tattoo/widget_tooltip.cpp
index 1560cb9a80..27f9c22d69 100644
--- a/engines/sherlock/tattoo/widget_tooltip.cpp
+++ b/engines/sherlock/tattoo/widget_tooltip.cpp
@@ -44,10 +44,10 @@ void WidgetTooltipBase::draw() {
 
 		// Blit the affected area to the screen
 		screen.slamRect(_bounds);
-		
+
 		// Draw the widget directly onto the screen. Unlike other widgets, we don't draw to the back buffer,
 		// since nothing should be drawing on top of tooltips, so there's no need to store in the back buffer
-		screen.SHtransBlitFrom(_surface, Common::Point(_bounds.left - screen._currentScroll.x, 
+		screen.SHtransBlitFrom(_surface, Common::Point(_bounds.left - screen._currentScroll.x,
 			_bounds.top - screen._currentScroll.y));
 
 		// Store a copy of the drawn area for later erasing
@@ -76,7 +76,7 @@ void WidgetTooltip::setText(const Common::String &str) {
 	Events &events = *_vm->_events;
 	Common::Point mousePos = events.mousePos();
 	bool reset = false;
-	
+
 	// Make sure that the description is present
 	if (!str.empty()) {
 		int width = _surface.stringWidth(str) + 2;
@@ -200,7 +200,7 @@ void WidgetSceneTooltip::handleEvents() {
 				str = scene._exits[ui._arrowZone]._dest;
 			}
 
-			setText(str.hasPrefix(" ") ? Common::String() : str);			
+			setText(str.hasPrefix(" ") ? Common::String() : str);
 		} else if ((ui._bgFound == -1 && ui._oldBgFound != -1) || (ui._arrowZone == -1 && ui._oldArrowZone != -1)) {
 			setText("");
 		}
diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp
index 5041888ffb..171fb247bc 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -65,7 +65,7 @@ void WidgetVerbs::load(bool objectsOn) {
 
 			if (scumm_strnicmp(person._examine.c_str(), "_EXIT", 5))
 				_verbCommands.push_back(FIXED(Look));
-			
+
 			_verbCommands.push_back(FIXED(Talk));
 
 			// Add any extra active verbs from the NPC's verb list
@@ -116,7 +116,7 @@ void WidgetVerbs::load(bool objectsOn) {
 	// Set the bounds
 	_bounds = Common::Rect(width, height);
 	_bounds.moveTo(mousePos.x - _bounds.width() / 2, mousePos.y - _bounds.height() / 2);
-	
+
 	// Render the window on the internal surface
 	render();
 }
@@ -134,7 +134,7 @@ void WidgetVerbs::render() {
 
 	// Draw the verb commands and the lines separating them
 	for (uint idx = 0; idx < _verbCommands.size(); ++idx) {
-		_surface.writeString(_verbCommands[idx], Common::Point((_bounds.width() - _surface.stringWidth(_verbCommands[idx])) / 2, 
+		_surface.writeString(_verbCommands[idx], Common::Point((_bounds.width() - _surface.stringWidth(_verbCommands[idx])) / 2,
 			(_surface.fontHeight() + 7) * idx + 5), INFO_TOP);
 
 		if (idx < (_verbCommands.size() - 1)) {
@@ -143,7 +143,7 @@ void WidgetVerbs::render() {
 			_surface.hLine(3, (_surface.fontHeight() + 7) * (idx + 1) + 2, _bounds.width() - 4, INFO_BOTTOM);
 
 			_surface.SHtransBlitFrom(images[4], Common::Point(0, (_surface.fontHeight() + 7) * (idx + 1) - 1));
-			_surface.SHtransBlitFrom(images[5], Common::Point(_bounds.width() - images[5]._width, 
+			_surface.SHtransBlitFrom(images[5], Common::Point(_bounds.width() - images[5]._width,
 				(_surface.fontHeight() + 7) * (idx + 1) - 1));
 		}
 	}
@@ -226,7 +226,7 @@ void WidgetVerbs::handleEvents() {
 				// Talk command is being activated
 				talk.initTalk(ui._activeObj);
 				ui._activeObj = -1;
-			
+
 			} else if (!_verbCommands[_selector].compareToIgnoreCase(strJournal)) {
 				ui.doJournal();
 
diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h
index c16c9f5d11..852b608245 100644
--- a/engines/sherlock/user_interface.h
+++ b/engines/sherlock/user_interface.h
@@ -102,7 +102,7 @@ public:
 
 	/**
 	 * Draw the user interface onto the screen's back buffers
-	 */	
+	 */
 	virtual void drawInterface(int bufferNum = 3) {}
 
 	/**
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index ce62dcb2ae..c2ca557ec2 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -236,7 +236,7 @@ SkyCompact::SkyCompact() {
 	for (cnt = 0; cnt < _numSaveIds; cnt++)
 		_saveIds[cnt] = FROM_LE_16(_saveIds[cnt]);
 	_resetDataPos = _cptFile->pos();
-	
+
 	checkAndFixOfficerBluntError();
 }
 
@@ -259,7 +259,7 @@ SkyCompact::~SkyCompact() {
 	delete _cptFile;
 }
 
-/* WORKAROUND for bug #2687: 
+/* WORKAROUND for bug #2687:
 	The first release of scummvm with externalized, binary compact data has one broken 16 bit reference.
 	When talking to Officer Blunt on ground level while in a crouched position, the game enters an
 	unfinishable state because Blunt jumps into the lake and can no longer be interacted with.
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index d86689e5d7..4b91f50a61 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -78,7 +78,7 @@ public:
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual GameList getSupportedGames() const;
 	virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
-	virtual GameDescriptor findGame(const char *gameid) const;	
+	virtual GameDescriptor findGame(const char *gameid) const;
 	virtual GameList detectGames(const Common::FSList &fslist) const;
 
 	virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp
index 423a2b86b4..cd65855653 100644
--- a/engines/sword25/gfx/animationresource.cpp
+++ b/engines/sword25/gfx/animationresource.cpp
@@ -211,7 +211,7 @@ bool AnimationResource::precacheAllFrames() const {
 			error("Could not precache \"%s\".", (*iter).fileName.c_str());
 			return false;
 		}
-#else		 
+#else
 		Resource *pResource = Kernel::getInstance()->getResourceManager()->requestResource((*iter).fileName);
 		pResource->release(); //unlock precached resource
 #endif
diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp
index 1d7aedcb6e..78276338da 100644
--- a/engines/sword25/gfx/fontresource.cpp
+++ b/engines/sword25/gfx/fontresource.cpp
@@ -103,7 +103,7 @@ bool FontResource::parserCallback_font(ParserNode *node) {
 	if (!_pKernel->getResourceManager()->precacheResource(_bitmapFileName)) {
 		error("Could not precache \"%s\".", _bitmapFileName.c_str());
 	}
-#else	
+#else
 	Resource *pResource = _pKernel->getResourceManager()->requestResource(_bitmapFileName);
 	pResource->release(); //unlock precached resource
 #endif
diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index 87bedcc9c1..19425b50ab 100644
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -75,7 +75,7 @@ PackageManager::~PackageManager() {
 Common::String PackageManager::ensureSpeechLang(const Common::String &fileName) {
 	if (!_useEnglishSpeech || fileName.size() < 9 || !fileName.hasPrefix("/speech/"))
 		return fileName;
-	
+
 	// Always keep German speech as a fallback in case the English speech pack is not present.
 	// However this means we cannot play with German text and English voice.
 	if (fileName.hasPrefix("/speech/de"))
diff --git a/engines/sword25/package/packagemanager.h b/engines/sword25/package/packagemanager.h
index 5475cb02fc..72e15e6bcd 100644
--- a/engines/sword25/package/packagemanager.h
+++ b/engines/sword25/package/packagemanager.h
@@ -87,7 +87,7 @@ private:
 	Common::String _currentDirectory;
 	Common::FSNode _rootFolder;
 	Common::List<ArchiveEntry *> _archiveList;
-	
+
 	bool _useEnglishSpeech;
 	Common::String ensureSpeechLang(const Common::String &fileName);
 
diff --git a/engines/titanic/carry/glass.cpp b/engines/titanic/carry/glass.cpp
index 03050dc60d..ff4c54ca39 100644
--- a/engines/titanic/carry/glass.cpp
+++ b/engines/titanic/carry/glass.cpp
@@ -90,7 +90,7 @@ bool CGlass::UseWithCharMsg(CUseWithCharMsg *msg) {
 
 		if (_string6 != "Bird")
 			setPosition(_origPos);
-		
+
 		actMsg.execute(msg->_character);
 	} else {
 		petAddToInventory();
diff --git a/engines/titanic/carry/note.cpp b/engines/titanic/carry/note.cpp
index 388f87e638..f06e41094f 100644
--- a/engines/titanic/carry/note.cpp
+++ b/engines/titanic/carry/note.cpp
@@ -35,7 +35,7 @@ void CNote::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeQuotedLine(_string6, indent);
 	file->writeNumberLine(_field138, indent);
-	
+
 	CCarry::save(file, indent);
 }
 
diff --git a/engines/titanic/carry/phonograph_cylinder.cpp b/engines/titanic/carry/phonograph_cylinder.cpp
index 3dedbc4ac9..777aa8be5b 100644
--- a/engines/titanic/carry/phonograph_cylinder.cpp
+++ b/engines/titanic/carry/phonograph_cylinder.cpp
@@ -118,7 +118,7 @@ bool CPhonographCylinder::QueryCylinderMsg(CQueryCylinderMsg *msg) {
 
 bool CPhonographCylinder::RecordOntoCylinderMsg(CRecordOntoCylinderMsg *msg) {
 	_itemName = "STMusic";
-	
+
 	CQueryMusicControlSettingMsg queryMsg;
 	queryMsg.execute("Bells Mute Control");
 	_bellsMuteControl = queryMsg._value;
@@ -145,7 +145,7 @@ bool CPhonographCylinder::RecordOntoCylinderMsg(CRecordOntoCylinderMsg *msg) {
 	queryMsg.execute("Piano Speed Control");
 	_pianoSpeedControl = queryMsg._value;
 	queryMsg.execute("Piano Pitch Control");
-	_pianoPitchControl = queryMsg._value;	
+	_pianoPitchControl = queryMsg._value;
 	queryMsg.execute("Piano Inversion Control");
 	_pianoInversionControl = queryMsg._value;
 	queryMsg.execute("Piano Direction Control");
diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h
index 4cecee4882..0b02d9d938 100644
--- a/engines/titanic/core/file_item.h
+++ b/engines/titanic/core/file_item.h
@@ -44,7 +44,7 @@ public:
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file);	
+	virtual void load(SimpleFile *file);
 
 	/**
 	 * Returns true if the item is a file item
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 2e3132c2f4..8f71b3d995 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -89,7 +89,7 @@ void CGameObject::save(SimpleFile *file, int indent) {
 
 	if (_surface) {
 		const CMovieRangeInfoList *rangeList = _surface->getMovieRangeInfo();
-		
+
 		if (rangeList) {
 			for (CMovieRangeInfoList::const_iterator i = rangeList->begin();
 				i != rangeList->end(); ++i) {
@@ -109,7 +109,7 @@ void CGameObject::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(_field40, indent + 1);
 	file->writeQuotedLine(_resource, indent + 1);
 	file->writeBounds(_bounds, indent + 1);
-	
+
 	file->writeFloatLine(_field34, indent + 1);
 	file->writeFloatLine(_field38, indent + 1);
 	file->writeFloatLine(_field3C, indent + 1);
@@ -178,7 +178,7 @@ void CGameObject::load(SimpleFile *file) {
 		_id = file->readNumber();
 		_roomFlags = file->readNumber();
 
-		resourceKey.load(file);		
+		resourceKey.load(file);
 		_surface = nullptr;
 		val = file->readNumber();
 		if (val) {
@@ -199,7 +199,7 @@ void CGameObject::draw(CScreenManager *screenManager) {
 	if (_credits && _credits->_objectP == this) {
 		if (!_credits->draw())
 			CGameObject::deinit();
-		
+
 		return;
 	}
 
@@ -354,7 +354,7 @@ void CGameObject::loadMovie(const CString &name, bool pendingFlag) {
 	// Create the surface if it doesn't already exist
 	if (!_surface) {
 		CGameManager *gameManager = getGameManager();
-		_surface = new OSVideoSurface(gameManager->setScreenManager(), nullptr);		
+		_surface = new OSVideoSurface(gameManager->setScreenManager(), nullptr);
 	}
 
 	// Load the new movie resource
@@ -405,7 +405,7 @@ void CGameObject::loadFrame(int frameNumber) {
 	_frameNumber = -1;
 	if (!_resource.empty())
 		loadResource(_resource);
-	
+
 	if (_surface)
 		_surface->setMovieFrame(frameNumber);
 
@@ -859,14 +859,14 @@ CViewItem *CGameObject::parseView(const CString &viewString) {
 
 	CRoomItem *room = gameManager->getRoom();
 	CProjectItem *project = room->getRoot();
-	
+
 	// Ensure we have the specified room
 	if (project) {
 		if (room->getName() != roomName) {
 			// Scan for the correct room
 			for (room = project->findFirstRoom(); room && room->getName() != roomName;
 					room = project->findNextRoom(room)) ;
-		}			
+		}
 	}
 	if (!room)
 		return nullptr;
@@ -954,7 +954,7 @@ CGameObject *CGameObject::findMailByFlags(int mode, uint roomFlags) {
 	CMailMan *mailMan = getMailMan();
 	if (!mailMan)
 		return nullptr;
-	
+
 	for (CGameObject *obj = mailMan->getFirstObject(); obj;
 			obj = mailMan->getNextObject(obj)) {
 		if (compareRoomFlags(mode, roomFlags, obj->_roomFlags))
@@ -1078,7 +1078,7 @@ void CGameObject::setText(const CString &str, int border, int borderRight) {
 		_text = new CPetText();
 	_textBorder = border;
 	_textBorderRight = borderRight;
-	
+
 	_text->setText(str);
 	CScreenManager *screenManager = getGameManager()->setScreenManager();
 	_text->scrollToTop(screenManager);
@@ -1208,7 +1208,7 @@ bool CGameObject::changeView(const CString &viewName, const CString &clipName) {
 
 	if (!oldView || !newView)
 		return false;
-	
+
 	CMovieClip *clip = nullptr;
 	if (!clipName.empty()) {
 		clip = oldView->findNode()->findRoom()->findClip(clipName);
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index b9a55ac008..b50278cf21 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -401,7 +401,7 @@ protected:
 	 * Clear the PET display
 	 */
 	void petClear() const;
-	
+
 	/**
 	 * Returns the MailMan
 	 */
@@ -488,7 +488,7 @@ protected:
 	 * Locks the PET, disabling all input. Can be called multiple times
 	 */
 	void petLockInput();
-	
+
 	/**
 	 * Unlocks PET input
 	 */
@@ -646,7 +646,7 @@ public:
 	 * Change the object's status
 	 */
 	void playMovie(uint flags);
-	
+
 	/**
 	 * Play the movie specified in _resource
 	 */
@@ -671,7 +671,7 @@ public:
 	 * Get the current movie frame
 	 */
 	int getMovieFrame() const;
-	
+
 	/**
 	 * Returns the object's frame number
 	 */
@@ -706,7 +706,7 @@ public:
 	 * Return the player's passenger class
 	 */
 	int getPassengerClass() const;
-	
+
 	/**
 	 * Return the player's previous passenger class
 	 */
@@ -732,7 +732,7 @@ public:
 	 * Returns a hidden object
 	 */
 	CGameObject *getHiddenObject(const CString &name) const;
-	
+
 	/**
 	 * Sets up credits text
 	 */
@@ -742,7 +742,7 @@ public:
 	 * Support function for drag moving
 	 */
 	void dragMove(const Point &pt);
-	
+
 	/**
 	 * Returns the currently dragging item (if any) if it's a game object
 	 */
@@ -965,17 +965,17 @@ public:
 	/*--- CGameState Methods ---*/
 
 	void setState1C(bool flag);
-	
+
 	/**
 	 * Change to the next season
 	 */
 	void stateChangeSeason();
-	
+
 	/**
 	 * Returns the currently active season
 	 */
 	Season stateGetSeason() const;
-	
+
 	void stateSet24();
 	int stateGet24() const;
 	void stateInc38();
diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index f77d081c61..559191efc9 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -57,8 +57,8 @@ CString CLinkItem::formName() {
 			view->getName().c_str(), destView->getName().c_str());
 
 	case 3:
-		return CString::format("_TRACK,%d,%s,%d,%s", 
-			node->_nodeNumber, view->getName().c_str(), 
+		return CString::format("_TRACK,%d,%s,%d,%s",
+			node->_nodeNumber, view->getName().c_str(),
 			destNode->_nodeNumber, destView->getName().c_str());
 
 	case 4:
diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h
index 91a74adbdc..09068fb06a 100644
--- a/engines/titanic/core/list.h
+++ b/engines/titanic/core/list.h
@@ -130,7 +130,7 @@ public:
 	 */
 	void destroyContents() {
 		typename Common::List<T *>::iterator i;
-		for (i = Common::List<T *>::begin(); 
+		for (i = Common::List<T *>::begin();
 				i != Common::List<T *>::end(); ++i) {
 			CSaveableObject *obj = *i;
 			delete obj;
@@ -149,7 +149,7 @@ public:
 	}
 
 	bool contains(const T *item) const {
-		for (typename Common::List<T *>::const_iterator i = Common::List<T *>::begin(); 
+		for (typename Common::List<T *>::const_iterator i = Common::List<T *>::begin();
 				i != Common::List<T *>::end(); ++i) {
 			if (*i == item)
 				return true;
diff --git a/engines/titanic/core/message_target.cpp b/engines/titanic/core/message_target.cpp
index 4815d03973..a1060c643e 100644
--- a/engines/titanic/core/message_target.cpp
+++ b/engines/titanic/core/message_target.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-const MSGMAP *CMessageTarget::getMessageMap() const { 
+const MSGMAP *CMessageTarget::getMessageMap() const {
 	return getThisMessageMap();
 }
 
diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index 76293233b0..65e8645baa 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -287,7 +287,7 @@ void CProjectItem::saveData(SimpleFile *file, CTreeItem *item) const {
 		item->saveHeader(file, 0);
 		item->save(file, 1);
 		item->saveFooter(file, 0);
-	
+
 		CTreeItem *child = item->getFirstChild();
 		if (child) {
 			file->write("\n{\n", 3);
@@ -300,7 +300,7 @@ void CProjectItem::saveData(SimpleFile *file, CTreeItem *item) const {
 			file->write("\n{\n", 3);
 			file->writeQuotedString("ALONG");
 		}
-		
+
 		file->write("\n}\n", 3);
 		item = item->getNextSibling();
 	}
diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h
index 473ffd9556..4d009dd50b 100644
--- a/engines/titanic/core/project_item.h
+++ b/engines/titanic/core/project_item.h
@@ -66,7 +66,7 @@ public:
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file);	
+	virtual void load(SimpleFile *file);
 };
 
 /**
@@ -89,7 +89,7 @@ private:
 	 * Called during save, iterates through the children to do some stuff
 	 */
 	void buildFilesList();
-	
+
 	/**
 	 * Called at the beginning of loading a game
 	 */
@@ -161,7 +161,7 @@ public:
 	/**
 	 * Load the data for the class from file
 	 */
-	virtual void load(SimpleFile *file);	
+	virtual void load(SimpleFile *file);
 
 	/**
 	 * Get the game manager for the project
diff --git a/engines/titanic/core/resource_key.cpp b/engines/titanic/core/resource_key.cpp
index 3b390af2d4..3db5812d7d 100644
--- a/engines/titanic/core/resource_key.cpp
+++ b/engines/titanic/core/resource_key.cpp
@@ -37,7 +37,7 @@ void CResourceKey::save(SimpleFile *file, int indent) {
 
 void CResourceKey::load(SimpleFile *file) {
 	int val = file->readNumber();
-	
+
 	if (val == 0 || val == 1) {
 		file->readBuffer();
 		CString str = file->readString();
diff --git a/engines/titanic/core/room_item.cpp b/engines/titanic/core/room_item.cpp
index 49b3232ba1..1c360c7571 100644
--- a/engines/titanic/core/room_item.cpp
+++ b/engines/titanic/core/room_item.cpp
@@ -59,7 +59,7 @@ void CRoomItem::save(SimpleFile *file, int indent) {
 
 void CRoomItem::load(SimpleFile *file) {
 	int val = file->readNumber();
-	
+
 	switch (val) {
 	case 3:
 		// Read exit movie
@@ -114,7 +114,7 @@ void CRoomItem::postLoad() {
 
 void CRoomItem::calcNodePosition(const Point &nodePos, double &xVal, double &yVal) const {
 	xVal = yVal = 0.0;
-	
+
 	if (_roomDimensionX >= 0.0 && _roomDimensionY >= 0.0) {
 		xVal = _roomRect.width() / _roomDimensionX;
 		yVal = _roomRect.height() / _roomDimensionY;
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 630404a6ee..7522a34737 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -421,7 +421,7 @@ CSaveableObject *ClassDef::create() {
 
 /*------------------------------------------------------------------------*/
 
-Common::HashMap<Common::String, CSaveableObject::CreateFunction> * 
+Common::HashMap<Common::String, CSaveableObject::CreateFunction> *
 	CSaveableObject::_classList = nullptr;
 Common::List<ClassDef *> *CSaveableObject::_classDefs;
 
@@ -1346,7 +1346,7 @@ void CSaveableObject::initClassList() {
 	ADDFN(CTextUp, CPetGraphic);
 	ADDFN(CToggleButton, CBackground);
 	ADDFN(CToggleSwitch, CGameObject);
-	
+
 	ADDFN(CActMsg, CMessage);
 	ADDFN(CActivationmsg, CMessage);
 	ADDFN(CAddHeadPieceMsg, CMessage);
diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h
index 6d80ad121d..4c7c1a7737 100644
--- a/engines/titanic/core/saveable_object.h
+++ b/engines/titanic/core/saveable_object.h
@@ -47,7 +47,7 @@ public:
 template<typename T>
 class TypeTemplate : public ClassDef {
 public:
-	TypeTemplate(const char *className, ClassDef *parent) : 
+	TypeTemplate(const char *className, ClassDef *parent) :
 		ClassDef(className, parent) {}
 	virtual CSaveableObject *create() { return new T(); }
 };
@@ -79,7 +79,7 @@ public:
 public:
 	CLASSDEF
 	virtual ~CSaveableObject() {}
-	
+
 	bool isInstanceOf(const ClassDef *classDef) const;
 
 	/**
@@ -91,13 +91,13 @@ public:
 	 * Load the data for the class from file
 	 */
 	virtual void load(SimpleFile *file);
-	
+
 	/**
 	 * Write out a header definition for the class to file
 	 * prior to saving the actual data for the class
 	 */
 	virtual void saveHeader(SimpleFile *file, int indent);
-	
+
 	/**
 	 * Writes out a footer for the class after it's data has
 	 * been written to file
diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp
index 86c34cab8b..97d06d7bbe 100644
--- a/engines/titanic/core/tree_item.cpp
+++ b/engines/titanic/core/tree_item.cpp
@@ -51,7 +51,7 @@ void CTreeItem::dump(int indent) {
 	CTreeItem *item = getFirstChild();
 	while (item) {
 		item->dump(indent + 1);
-		
+
 		item = item->getNextSibling();
 	}
 }
diff --git a/engines/titanic/core/turn_on_play_sound.cpp b/engines/titanic/core/turn_on_play_sound.cpp
index ab50b33134..44a9b3b0eb 100644
--- a/engines/titanic/core/turn_on_play_sound.cpp
+++ b/engines/titanic/core/turn_on_play_sound.cpp
@@ -28,7 +28,7 @@ BEGIN_MESSAGE_MAP(CTurnOnPlaySound, CTurnOnObject)
 	ON_MESSAGE(MouseButtonUpMsg)
 END_MESSAGE_MAP()
 
-CTurnOnPlaySound::CTurnOnPlaySound() : CTurnOnObject(), 
+CTurnOnPlaySound::CTurnOnPlaySound() : CTurnOnObject(),
 		_soundName("NULL"), _soundVolume(80), _soundVal3(0) {
 }
 
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 176765b12f..9b20860a46 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -63,7 +63,7 @@ void CViewItem::save(SimpleFile *file, int indent) {
 
 void CViewItem::load(SimpleFile *file) {
 	int val = file->readNumber();
-	
+
 	switch (val) {
 	case 1:
 		_resourceKey.load(file);
@@ -86,7 +86,7 @@ bool CViewItem::getResourceKey(CResourceKey *key) {
 }
 
 void CViewItem::leaveView(CViewItem *newView) {
-	// Only do the processing if we've been passed a view, and it's not the same 
+	// Only do the processing if we've been passed a view, and it's not the same
 	if (newView && newView != this) {
 		CLeaveViewMsg viewMsg(this, newView);
 		viewMsg.execute(this, nullptr, MSGFLAG_SCAN);
@@ -112,7 +112,7 @@ void CViewItem::leaveView(CViewItem *newView) {
 }
 
 void CViewItem::preEnterView(CViewItem *newView) {
-	// Only do the processing if we've been passed a view, and it's not the same 
+	// Only do the processing if we've been passed a view, and it's not the same
 	if (newView && newView != this) {
 		CPreEnterViewMsg viewMsg(this, newView);
 		viewMsg.execute(newView, nullptr, MSGFLAG_SCAN);
@@ -134,7 +134,7 @@ void CViewItem::preEnterView(CViewItem *newView) {
 }
 
 void CViewItem::enterView(CViewItem *newView) {
-	// Only do the processing if we've been passed a view, and it's not the same 
+	// Only do the processing if we've been passed a view, and it's not the same
 	if (newView && newView != this) {
 		CEnterViewMsg viewMsg(this, newView);
 		viewMsg.execute(newView, nullptr, MSGFLAG_SCAN);
diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp
index 086c6bfaaa..5d95ef5186 100644
--- a/engines/titanic/debugger.cpp
+++ b/engines/titanic/debugger.cpp
@@ -112,7 +112,7 @@ void Debugger::listRooms() {
 	CRoomItem *room = gm._gameState._gameLocation.getRoom();
 	debugPrintf("Current location: %s, %s, %s\n", room->getName().c_str(),
 		node->getName().c_str(), view->getName().c_str());
-	
+
 	debugPrintf("Available rooms:\n");
 	for (CTreeItem *treeItem = root; treeItem; treeItem = treeItem->scan(root)) {
 		CRoomItem *roomItem = dynamic_cast<CRoomItem *>(treeItem);
@@ -142,7 +142,7 @@ bool Debugger::cmdDump(int argc, const char **argv) {
 	CTreeItem *root = g_vm->_window->_gameManager->_project;
 	if (argc == 2)
 		root = root->findByName(argv[1]);
-	
+
 	if (root == nullptr) {
 		debugPrintf("Could not find item\n");
 	} else {
@@ -207,7 +207,7 @@ bool Debugger::cmdPET(int argc, const char **argv) {
 			return true;
 		}
 	}
-	
+
 	debugPrintf("%s [on | off]\n", argv[0]);
 	return true;
 }
diff --git a/engines/titanic/debugger.h b/engines/titanic/debugger.h
index cae8a07d80..919d6c5358 100644
--- a/engines/titanic/debugger.h
+++ b/engines/titanic/debugger.h
@@ -44,27 +44,27 @@ private:
 	 * Find a room by name or number
 	 */
 	CRoomItem *findRoom(const char *name);
-	
+
 	/**
 	 * Find a node within a room by name or number
 	 */
 	CNodeItem *findNode(CRoomItem *room, const char *name);
-	
+
 	/**
 	 * Find a view within a room node by name or number
 	 */
 	CViewItem *findView(CNodeItem *node, const char *name);
-	
+
 	/**
 	 * List all the rooms in the game
 	 */
 	void listRooms();
-	
+
 	/**
 	 * List the nodes within a room
 	 */
 	void listRoom(CRoomItem *room);
-	
+
 	/**
 	 * List the views within a room node
 	 */
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index 096cd4b618..33bae22312 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -128,7 +128,7 @@ SaveStateList TitanicMetaEngine::listSaves(const char *target) const {
 			if (in) {
 				Titanic::CompressedFile cf;
 				cf.open(in);
-				
+
 				if (Titanic::CProjectItem::readSavegameHeader(&cf, header))
 					saveList.push_back(SaveStateDescriptor(slot, header._saveName));
 
diff --git a/engines/titanic/detection_tables.h b/engines/titanic/detection_tables.h
index ba67942dfe..5ff09cec16 100644
--- a/engines/titanic/detection_tables.h
+++ b/engines/titanic/detection_tables.h
@@ -21,7 +21,7 @@
  */
 
 namespace Titanic {
-	
+
 static const TitanicGameDescription gameDescriptions[] = {
 	{
 		{
diff --git a/engines/titanic/events.h b/engines/titanic/events.h
index 68666c7c46..3ea9b63217 100644
--- a/engines/titanic/events.h
+++ b/engines/titanic/events.h
@@ -34,8 +34,8 @@ namespace Titanic {
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 #define DOUBLE_CLICK_TIME 100
 
-enum SpecialButtons { 
-	MK_LBUTTON = 1, MK_RBUTTON = 2, MK_SHIFT = 4, MK_CONTROL = 8, 
+enum SpecialButtons {
+	MK_LBUTTON = 1, MK_RBUTTON = 2, MK_SHIFT = 4, MK_CONTROL = 8,
 	MK_MBUTTON = 0x10
 };
 
diff --git a/engines/titanic/game/bar_menu.cpp b/engines/titanic/game/bar_menu.cpp
index 3812a8dab6..476e243fe9 100644
--- a/engines/titanic/game/bar_menu.cpp
+++ b/engines/titanic/game/bar_menu.cpp
@@ -40,7 +40,7 @@ void CBarMenu::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(_barFrameNumber, indent);
 	file->writeNumberLine(_visibleFlag, indent);
 	file->writeNumberLine(_numFrames, indent);
-	
+
 	CGameObject::save(file, indent);
 }
 
@@ -67,7 +67,7 @@ bool CBarMenu::PETDownMsg(CPETDownMsg *msg) {
 	if (_visibleFlag) {
 		if (--_barFrameNumber < 0)
 			_barFrameNumber = _numFrames - 1;
-		
+
 		loadFrame(_barFrameNumber);
 	}
 
diff --git a/engines/titanic/game/cdrom_computer.cpp b/engines/titanic/game/cdrom_computer.cpp
index ceb0595188..5fd8e16350 100644
--- a/engines/titanic/game/cdrom_computer.cpp
+++ b/engines/titanic/game/cdrom_computer.cpp
@@ -29,7 +29,7 @@ BEGIN_MESSAGE_MAP(CCDROMComputer, CGameObject)
 	ON_MESSAGE(MouseButtonDownMsg)
 END_MESSAGE_MAP()
 
-CCDROMComputer::CCDROMComputer() : CGameObject(), 
+CCDROMComputer::CCDROMComputer() : CGameObject(),
 		_clickRect(0, 3, 55, 32) {
 }
 
@@ -58,7 +58,7 @@ bool CCDROMComputer::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	if (tray) {
 		CStatusChangeMsg statusMsg;
 		statusMsg.execute(tray);
-		
+
 		if (!statusMsg._success) {
 			// Check if the mouse is within the clickable area
 			Rect tempRect = _clickRect;
diff --git a/engines/titanic/game/cdrom_tray.cpp b/engines/titanic/game/cdrom_tray.cpp
index 1e5b135d35..505bdad319 100644
--- a/engines/titanic/game/cdrom_tray.cpp
+++ b/engines/titanic/game/cdrom_tray.cpp
@@ -110,7 +110,7 @@ bool CCDROMTray::ActMsg(CActMsg *msg) {
 
 bool CCDROMTray::MovieEndMsg(CMovieEndMsg *msg) {
 	CTreeItem *screen = getRoom()->findByName("newScreen");
-	
+
 	if (screen) {
 		CActMsg actMsg(_insertedCD);
 		actMsg.execute(screen);
diff --git a/engines/titanic/game/chev_code.cpp b/engines/titanic/game/chev_code.cpp
index 0acdf575f4..9381e1563a 100644
--- a/engines/titanic/game/chev_code.cpp
+++ b/engines/titanic/game/chev_code.cpp
@@ -69,7 +69,7 @@ bool CChevCode::SetChevFloorBits(CSetChevFloorBits *msg) {
 	int section = (msg->_floorNum + 4) / 10;
 	int index = (msg->_floorNum + 4) % 10;
 	_chevCode &= ~0xFF00;
-	
+
 	int val = 0;
 	switch (section) {
 	case 0:
@@ -87,7 +87,7 @@ bool CChevCode::SetChevFloorBits(CSetChevFloorBits *msg) {
 	default:
 		break;
 	}
-	
+
 	_chevCode |= ((index + val) << 8);
 	return true;
 }
diff --git a/engines/titanic/game/chev_panel.cpp b/engines/titanic/game/chev_panel.cpp
index ed730c9d61..5b58cbe594 100644
--- a/engines/titanic/game/chev_panel.cpp
+++ b/engines/titanic/game/chev_panel.cpp
@@ -41,7 +41,7 @@ void CChevPanel::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(_startPos.x, indent);
 	file->writeNumberLine(_startPos.y, indent);
 	file->writeNumberLine(_chevCode, indent);
-	
+
 	CGameObject::save(file, indent);
 }
 
diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index e1e07844e1..8e02a1ec5c 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -107,7 +107,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
 			_fieldE8 = 1;
 		}
 		break;
-	
+
 	default:
 		break;
 	}
diff --git a/engines/titanic/game/code_wheel.cpp b/engines/titanic/game/code_wheel.cpp
index 71d59ff514..441fddec02 100644
--- a/engines/titanic/game/code_wheel.cpp
+++ b/engines/titanic/game/code_wheel.cpp
@@ -77,7 +77,7 @@ bool CodeWheel::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 
 		_state = (_state + 1) % 15;
 		playMovie(START_FRAMES[_state], END_FRAMES[_state],
-			MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);		
+			MOVIE_GAMESTATE | MOVIE_NOTIFY_OBJECT);
 	} else {
 		if (_state == _field108)
 			_field110 = true;
@@ -112,7 +112,7 @@ bool CodeWheel::MovieEndMsg(CMovieEndMsg *msg) {
 		changeMsg._newStatus = 1;
 	changeMsg.execute("Bomb");
 
-	return true;	
+	return true;
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/game/computer_screen.cpp b/engines/titanic/game/computer_screen.cpp
index 9a7ac4b34e..98bef6eb63 100644
--- a/engines/titanic/game/computer_screen.cpp
+++ b/engines/titanic/game/computer_screen.cpp
@@ -99,7 +99,7 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) {
 		playClip(51, 150);
 		playSound("a#31.wav");
 		playClip(151, 200);
-		
+
 		handle = playSound("a#27.wav");
 		playClip(200, 306);
 		playSound("a#30.wav");
@@ -116,7 +116,7 @@ bool CComputerScreen::TimerMsg(CTimerMsg *msg) {
 		playClip(392, 450);
 		startTalking("Doorbot", 0x3611A);
 		sleep(8000);
-		
+
 		playClip(450, 492);
 		startTalking("Doorbot", 0x36121);
 		playClip(492, 522);
diff --git a/engines/titanic/game/credits.cpp b/engines/titanic/game/credits.cpp
index d9149f6dd2..e13a2ce6f4 100644
--- a/engines/titanic/game/credits.cpp
+++ b/engines/titanic/game/credits.cpp
@@ -36,7 +36,7 @@ void CCredits::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_fieldBC, indent);
 	file->writeNumberLine(_fieldC0, indent);
-	
+
 	CGameObject::save(file, indent);
 }
 
@@ -60,7 +60,7 @@ bool CCredits::TimerMsg(CTimerMsg *msg) {
 	setVisible(true);
 	loadSound("a#16.wav");
 	loadSound("a#24.wav");
-	
+
 	playCutscene(0, 18);
 	playGlobalSound("a#16.wav", -1, false, false, 0);
 	playCutscene(19, 642);
diff --git a/engines/titanic/game/fan_control.cpp b/engines/titanic/game/fan_control.cpp
index ad3efc92fb..288fdb639f 100644
--- a/engines/titanic/game/fan_control.cpp
+++ b/engines/titanic/game/fan_control.cpp
@@ -128,7 +128,7 @@ bool CFanControl::StatusChangeMsg(CStatusChangeMsg *msg) {
 					}
 				}
 				break;
-			
+
 			default:
 				break;
 			}
diff --git a/engines/titanic/game/fan_noises.cpp b/engines/titanic/game/fan_noises.cpp
index 9144f523f4..d285563de3 100644
--- a/engines/titanic/game/fan_noises.cpp
+++ b/engines/titanic/game/fan_noises.cpp
@@ -96,7 +96,7 @@ bool CFanNoises::LeaveRoomMsg(CLeaveRoomMsg *msg) {
 	if (getParent() == msg->_oldRoom && _soundHandle != -1) {
 		if (isSoundActive(_soundHandle))
 			stopSound(_soundHandle, _stopSeconds);
-		
+
 		_soundHandle = -1;
 		_startFlag = false;
 	}
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp
index 26deda8bca..fc71ddd357 100644
--- a/engines/titanic/game/gondolier/gondolier_mixer.cpp
+++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp
@@ -73,7 +73,7 @@ bool CGondolierMixer::EnterRoomMsg(CEnterRoomMsg *msg) {
 		CTurnOn onMsg;
 		onMsg.execute(this);
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/game/gondolier/gondolier_slider.cpp b/engines/titanic/game/gondolier/gondolier_slider.cpp
index e7a46eb33d..e7ca61de9c 100644
--- a/engines/titanic/game/gondolier/gondolier_slider.cpp
+++ b/engines/titanic/game/gondolier/gondolier_slider.cpp
@@ -190,7 +190,7 @@ bool CGondolierSlider::FrameMsg(CFrameMsg *msg) {
 			int yp = 0;
 			if (_arrayIndex > 0)
 				yp = ARRAY[_arrayIndex] - ARRAY[_arrayIndex - 1];
-			
+
 			if (!_string2.empty()) {
 				CTranslateObjectMsg transMsg;
 				transMsg._delta = Point(0, yp);
diff --git a/engines/titanic/game/head_slot.cpp b/engines/titanic/game/head_slot.cpp
index f7df02d364..06c366abd6 100644
--- a/engines/titanic/game/head_slot.cpp
+++ b/engines/titanic/game/head_slot.cpp
@@ -87,9 +87,9 @@ bool CHeadSlot::AddHeadPieceMsg(CAddHeadPieceMsg *msg) {
 }
 
 bool CHeadSlot::SenseWorkingMsg(CSenseWorkingMsg *msg) {
-	if (_fieldEC) 
+	if (_fieldEC)
 		playMovie(_fieldE4, _fieldE8, 0);
-	
+
 	_string1 = msg->_value;
 	_fieldEC = false;
 	return true;
diff --git a/engines/titanic/game/idle_summoner.cpp b/engines/titanic/game/idle_summoner.cpp
index 5ca3209e28..0e3604a4a9 100644
--- a/engines/titanic/game/idle_summoner.cpp
+++ b/engines/titanic/game/idle_summoner.cpp
@@ -82,7 +82,7 @@ bool CIdleSummoner::TimerMsg(CTimerMsg *msg) {
 		int region = talkGetDialRegion("BellBot", 1);
 		uint delay = region == 1 ? 15000 : 12000;
 		uint enterTicks = MIN(getNodeEnterTicks(), _ticks);
-		
+
 		CString name;
 		uint ticks = getTicksCount() - enterTicks;
 		if (ticks > delay) {
diff --git a/engines/titanic/game/light_switch.cpp b/engines/titanic/game/light_switch.cpp
index 188691033a..6badf63b5b 100644
--- a/engines/titanic/game/light_switch.cpp
+++ b/engines/titanic/game/light_switch.cpp
@@ -40,7 +40,7 @@ END_MESSAGE_MAP()
 
 bool CLightSwitch::_flag;
 
-CLightSwitch::CLightSwitch() : CBackground(), 
+CLightSwitch::CLightSwitch() : CBackground(),
 		_fieldE0(0), _fieldE4(0), _fieldE8(0) {
 }
 
diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp
index 6f47131716..8f7845bc3f 100644
--- a/engines/titanic/game/missiveomat.cpp
+++ b/engines/titanic/game/missiveomat.cpp
@@ -96,7 +96,7 @@ bool CMissiveOMat::KeyCharMsg(CKeyCharMsg *msg) {
 		if (editMsg._param == 1000) {
 			editMsg._mode = 3;
 			editMsg.execute(loginControl);
-		
+
 			_string1 = editMsg._text;
 			if (!_string1.empty()) {
 				loadFrame(2);
@@ -222,7 +222,7 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) {
 		CString *strP = &_messages[_personIndex * 19];
 		for (_totalMessages = 0; !strP->empty(); ++strP, ++_totalMessages)
 			;
-		
+
 		CMissiveOMatActionMsg actionMsg;
 		actionMsg._action = REDRAW_MESSAGE;
 		actionMsg.execute(this);
@@ -237,7 +237,7 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) {
 			actionMsg.execute(this);
 		}
 		break;
-	
+
 	case PRIOR_MESSAGE:
 		if (_messageNum > 0) {
 			--_messageNum;
diff --git a/engines/titanic/game/music_console_button.cpp b/engines/titanic/game/music_console_button.cpp
index dc86765476..40492aafe4 100644
--- a/engines/titanic/game/music_console_button.cpp
+++ b/engines/titanic/game/music_console_button.cpp
@@ -56,7 +56,7 @@ bool CMusicConsoleButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 
 		CMusicHasStartedMsg startedMsg;
 		startedMsg.execute("Music Room Phonograph");
-	
+
 		if (CMusicRoom::_musicHandler->checkSound(1)
 				&& CMusicRoom::_musicHandler->checkSound(2)
 				&& CMusicRoom::_musicHandler->checkSound(3)) {
@@ -82,7 +82,7 @@ bool CMusicConsoleButton::LeaveViewMsg(CLeaveViewMsg *msg) {
 bool CMusicConsoleButton::SetMusicControlsMsg(CSetMusicControlsMsg *msg) {
 	CMusicRoom *musicRoom = getMusicRoom();
 	CQueryMusicControlSettingMsg queryMsg;
-	
+
 	queryMsg.execute("Bells Mute Control");
 	musicRoom->setMuteControl(BELLS, queryMsg._value == 1 ? 1 : 0);
 	queryMsg.execute("Bells Pitch Control");
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 96411ad6b7..3e2a38486d 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -100,7 +100,7 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
 		playSound("a#48.wav");
 		playSound("a#47.wav");
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
index 2654042967..69fc629606 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
@@ -35,7 +35,7 @@ BEGIN_MESSAGE_MAP(CParrotNutBowlActor, CGameObject)
 	ON_MESSAGE(NutPuzzleMsg)
 END_MESSAGE_MAP()
 
-CParrotNutBowlActor::CParrotNutBowlActor() : CGameObject(), 
+CParrotNutBowlActor::CParrotNutBowlActor() : CGameObject(),
 		_puzzleDone(0), _state(0) {
 }
 
@@ -43,7 +43,7 @@ void CParrotNutBowlActor::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_puzzleDone, indent);
 	file->writeNumberLine(_state, indent);
-	
+
 	CGameObject::save(file, indent);
 }
 
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index 751da931ac..49b8de509f 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -39,7 +39,7 @@ CParrotNutEater::CParrotNutEater() : CGameObject(), _fieldBC(0),
 void CParrotNutEater::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_fieldBC, indent);
-	
+
 	CGameObject::save(file, indent);
 }
 
diff --git a/engines/titanic/game/place_holder_item.cpp b/engines/titanic/game/place_holder_item.cpp
index ecd9c9a10b..108c25ced8 100644
--- a/engines/titanic/game/place_holder_item.cpp
+++ b/engines/titanic/game/place_holder_item.cpp
@@ -44,7 +44,7 @@ void CPlaceHolderItem::save(SimpleFile *file, int indent) {
 	file->writePoint(_pos1, indent);
 	file->writePoint(_pos2, indent);
 	file->writeQuotedLine(_string1, indent);
-	
+
 	CNamedItem::save(file, indent);
 }
 
@@ -89,7 +89,7 @@ void CPlaceHolderItem::load(SimpleFile *file) {
 	default:
 		break;
 	}
-	
+
 	CNamedItem::load(file);
 }
 
diff --git a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
index 8ad3dcb8d1..25613643ea 100644
--- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
+++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h
@@ -37,7 +37,7 @@ private:
 public:
 	CLASSDEF;
 	CBarShelfVisCentre() : CPlaceHolder(), _flag(false) {}
-	
+
 	/**
 	 * Save the data for the class to file
 	 */
diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp
index 8726d1a925..adf029d8f7 100644
--- a/engines/titanic/game/restaurant_cylinder_holder.cpp
+++ b/engines/titanic/game/restaurant_cylinder_holder.cpp
@@ -121,7 +121,7 @@ bool CRestaurantCylinderHolder::MovieEndMsg(CMovieEndMsg *msg) {
 bool CRestaurantCylinderHolder::QueryCylinderHolderMsg(CQueryCylinderHolderMsg *msg) {
 	CNamedItem *cylinder = findByName("Phonograph Cylinder", true);
 
-	msg->_value1 = _field118;	
+	msg->_value1 = _field118;
 	if (cylinder) {
 		msg->_value2 = 1;
 		msg->_target = cylinder;
diff --git a/engines/titanic/game/sauce_dispensor.cpp b/engines/titanic/game/sauce_dispensor.cpp
index 410d4a3153..7010d00be1 100644
--- a/engines/titanic/game/sauce_dispensor.cpp
+++ b/engines/titanic/game/sauce_dispensor.cpp
@@ -67,7 +67,7 @@ void CSauceDispensor::load(SimpleFile *file) {
 
 bool CSauceDispensor::Use(CUse *msg) {
 	CVisibleMsg visibleMsg(true);
-	
+
 	if (msg->_item->isEquals("Chicken")) {
 		CChicken *chicken = static_cast<CChicken *>(msg->_item);
 		_field104 = true;
@@ -113,7 +113,7 @@ bool CSauceDispensor::Use(CUse *msg) {
 
 			CActMsg actMsg(_string3);
 			actMsg.execute("BeerGlass");
-		}	
+		}
 	}
 
 	return true;
diff --git a/engines/titanic/game/service_elevator_window.cpp b/engines/titanic/game/service_elevator_window.cpp
index b0cc53abb4..13db7a26f8 100644
--- a/engines/titanic/game/service_elevator_window.cpp
+++ b/engines/titanic/game/service_elevator_window.cpp
@@ -69,7 +69,7 @@ bool CServiceElevatorWindow::ServiceElevatorFloorChangeMsg(CServiceElevatorFloor
 
 		int count = _endFrame - _startFrame;
 		setMovieFrameRate(1.0 * count / val);
-			
+
 		int startFrame = clip->_startFrame + count * FACTORS[msg->_value1] / 100;
 		int endFrame = clip->_startFrame + count * FACTORS[msg->_value2] / 100;
 
@@ -107,7 +107,7 @@ bool CServiceElevatorWindow::EnterViewMsg(CEnterViewMsg *msg) {
 			loadFrame(0);
 		}
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp
index d9c72d3021..2db26addf5 100644
--- a/engines/titanic/game/sgt/chest_of_drawers.cpp
+++ b/engines/titanic/game/sgt/chest_of_drawers.cpp
@@ -58,7 +58,7 @@ bool CChestOfDrawers::TurnOff(CTurnOff *msg) {
 		visibleMsg.execute("Drawer");
 		_statics->_v6 = "Closed";
 		_fieldE0 = true;
-		
+
 		_startFrame = 14;
 		_endFrame = 27;
 		playMovie(14, 27, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp
index 780f92b5ad..571ebcd6fa 100644
--- a/engines/titanic/game/television.cpp
+++ b/engines/titanic/game/television.cpp
@@ -137,7 +137,7 @@ bool CTelevision::ChangeSeasonMsg(CChangeSeasonMsg *msg) {
 		_v3 = 0;
 	}
 
-	return true; 
+	return true;
 }
 
 bool CTelevision::EnterViewMsg(CEnterViewMsg *msg) {
@@ -219,7 +219,7 @@ bool CTelevision::PETActivateMsg(CPETActivateMsg *msg) {
 			stopMovie();
 			if (isSoundActive(_soundHandle))
 				stopSound(_soundHandle, 0);
-			
+
 			setVisible(false);
 		}
 
diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp
index 10d62a0775..a642451fe0 100644
--- a/engines/titanic/game/transport/lift_indicator.cpp
+++ b/engines/titanic/game/transport/lift_indicator.cpp
@@ -150,7 +150,7 @@ bool CLiftindicator::PETActivateMsg(CPETActivateMsg *msg) {
 			petDisplayMessage(1, BOT_BLOCKING_ELEVATOR);
 		} else {
 			_endFrame = pet->getRoomsFloorNum();
-			
+
 			if (petGetRoomsWellEntry() == 4 && !CLift::_v6
 					&& pet->getRoomsFloorNum() != CLift::_elevator4Floor) {
 				petDisplayMessage(1, ELEVATOR_NON_FUNCTIONAL);
diff --git a/engines/titanic/game/transport/service_elevator.cpp b/engines/titanic/game/transport/service_elevator.cpp
index 1980825cb6..066a418dbb 100644
--- a/engines/titanic/game/transport/service_elevator.cpp
+++ b/engines/titanic/game/transport/service_elevator.cpp
@@ -24,7 +24,7 @@
 #include "titanic/core/room_item.h"
 #include "titanic/npcs/doorbot.h"
 
-namespace Titanic {	
+namespace Titanic {
 
 BEGIN_MESSAGE_MAP(CServiceElevator, CTransport)
 	ON_MESSAGE(BodyInBilgeRoomMsg)
@@ -182,7 +182,7 @@ bool CServiceElevator::TimerMsg(CTimerMsg *msg) {
 					else if (_v3 == 1)
 						actMsg._action = "DoorbotPlayerPressedMiddleButton";
 
-					actMsg.execute(doorbot);	
+					actMsg.execute(doorbot);
 				}
 			}
 		}
diff --git a/engines/titanic/game/variable_list.cpp b/engines/titanic/game/variable_list.cpp
index 1ddf1bc957..2a4a7df961 100644
--- a/engines/titanic/game/variable_list.cpp
+++ b/engines/titanic/game/variable_list.cpp
@@ -33,7 +33,7 @@ void CVariableListItem::save(SimpleFile *file, int indent) {
 	file->writeQuotedLine(_string2, indent);
 	file->writeQuotedLine(_string3, indent);
 	file->writeQuotedLine(_string4, indent);
-	
+
 	ListItem::save(file, indent);
 }
 
@@ -66,7 +66,7 @@ void CVariableListItem::load(SimpleFile *file) {
 
 	_field40 = field40;
 	_field44 = field44;
-	
+
 	ListItem::load(file);
 }
 
diff --git a/engines/titanic/game_location.cpp b/engines/titanic/game_location.cpp
index 3a1d0c9e48..1e4e067f70 100644
--- a/engines/titanic/game_location.cpp
+++ b/engines/titanic/game_location.cpp
@@ -52,7 +52,7 @@ void CGameLocation::load(SimpleFile *file) {
 
 void CGameLocation::setView(CViewItem *view) {
 	if (_view) {
-		for (CTreeItem *treeItem = _view; treeItem; 
+		for (CTreeItem *treeItem = _view; treeItem;
 				treeItem = treeItem->scan(_view)) {
 			CGameObject *obj = dynamic_cast<CGameObject *>(treeItem);
 			if (obj)
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 7d9dc37a10..6023244325 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -32,11 +32,11 @@ namespace Titanic {
 
 CGameManager::CGameManager(CProjectItem *project, CGameView *gameView, Audio::Mixer *mixer):
 		_project(project), _gameView(gameView), _trueTalkManager(this),
-		_inputHandler(this), _inputTranslator(&_inputHandler),		
+		_inputHandler(this), _inputTranslator(&_inputHandler),
 		_gameState(this), _sound(this, mixer), _musicRoom(this),
 		_treeItem(nullptr), _soundMaker(nullptr), _movieRoom(nullptr),
 		_dragItem(nullptr), _field54(0), _lastDiskTicksCount(0), _tickCount2(0) {
-	
+
 	CTimeEventInfo::_nextId = 0;
 	_movie = nullptr;
 	_movieSurface = CScreenManager::_screenManagerPtr->createSurface(600, 340);
@@ -95,7 +95,7 @@ void CGameManager::postLoad(CProjectItem *project) {
 				_gameView->setView(view);
 		}
 	}
-	
+
 	// Signal to anything interested that the game has been loaded
 	CLoadSuccessMsg msg(_lastDiskTicksCount - _tickCount2);
 	msg.execute(project, nullptr, MSGFLAG_SCAN);
@@ -188,7 +188,7 @@ void CGameManager::update() {
 		CTextCursor *textCursor = screenManager->_textCursor;
 		if (textCursor && textCursor->_active)
 			_bounds.extend(textCursor->getCursorBounds());
-		
+
 		// Set the surface bounds
 		screenManager->setSurfaceBounds(SURFACE_BACKBUFFER, _bounds);
 
diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h
index 262ea0169b..1671517e07 100644
--- a/engines/titanic/game_manager.h
+++ b/engines/titanic/game_manager.h
@@ -196,7 +196,7 @@ public:
 	/**
 	 * Flags whether the timer will be persisent across save & loads
 	 */
-	void setTimerPersisent(uint id, bool flag) { 
+	void setTimerPersisent(uint id, bool flag) {
 		_timers.setPersisent(id, flag);
 	}
 
diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index 8814dba831..ea94deec35 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -89,7 +89,7 @@ void CGameState::setMode(GameStateMode newMode) {
 	} else if (newMode != GSMODE_CUTSCENE && newMode != _mode) {
 		if (sm && sm->_mouseCursor)
 			sm->_mouseCursor->show();
-	
+
 		if (_gameManager)
 			_gameManager->unlockInputHandler();
 	}
diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h
index 70d47b55c1..77b4ded79f 100644
--- a/engines/titanic/game_state.h
+++ b/engines/titanic/game_state.h
@@ -33,7 +33,7 @@ namespace Titanic {
 
 class CGameManager;
 
-enum GameStateMode { 
+enum GameStateMode {
 	GSMODE_NONE = 0, GSMODE_INTERACTIVE = 1, GSMODE_CUTSCENE = 2,
 	GSMODE_3 = 3, GSMODE_4 = 4, GSMODE_INSERT_CD = 5, GSMODE_PENDING_LOAD = 6
 };
diff --git a/engines/titanic/game_view.cpp b/engines/titanic/game_view.cpp
index cb84b6a3b1..d155812390 100644
--- a/engines/titanic/game_view.cpp
+++ b/engines/titanic/game_view.cpp
@@ -58,7 +58,7 @@ void CGameView::createSurface(const CResourceKey &key) {
 	_gameManager->initBounds();
 	delete _surface;
 	_surface = nullptr;
-	
+
 	// Create a fresh surface
 	CScreenManager::setCurrent();
 	_surface = CScreenManager::_currentScreenManagerPtr->createSurface(key);
diff --git a/engines/titanic/game_view.h b/engines/titanic/game_view.h
index 29e800bc7a..e17d72b472 100644
--- a/engines/titanic/game_view.h
+++ b/engines/titanic/game_view.h
@@ -57,7 +57,7 @@ public:
 	 * Set the currently active view
 	 */
 	virtual void setView(CViewItem *item) = 0;
-	
+
 	virtual void draw(const Rect &bounds) = 0;
 
 	/**
diff --git a/engines/titanic/gfx/send_to_succ.h b/engines/titanic/gfx/send_to_succ.h
index 734c4a7db3..201735385d 100644
--- a/engines/titanic/gfx/send_to_succ.h
+++ b/engines/titanic/gfx/send_to_succ.h
@@ -32,7 +32,7 @@ class CSendToSucc : public CToggleSwitch {
 public:
 	CLASSDEF;
 	CSendToSucc();
-	
+
 	/**
 	 * Save the data for the class to file
 	 */
diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index df09cf24fb..9fa2b0073c 100644
--- a/engines/titanic/input_handler.cpp
+++ b/engines/titanic/input_handler.cpp
@@ -164,7 +164,7 @@ CGameObject *CInputHandler::dragEnd(const Point &pt, CTreeItem *dragItem) {
 	if (target) {
 		// Check if the cursor is on the PET. If so, pass to the PET
 		// to see what specific element the drag ended on
-		CProjectItem *project = view->getRoot();		
+		CProjectItem *project = view->getRoot();
 		if (project) {
 			CPetControl *petControl = project->getPetControl();
 			if (petControl && petControl->contains(pt)) {
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 690acdc25f..80da792e4a 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -130,14 +130,14 @@ int CMainGameWindow::selectSavegame() {
 
 void CMainGameWindow::setActiveView(CViewItem *viewItem) {
 	_gameManager->_gameState._gameLocation.setView(viewItem);
-	
+
 	CResourceKey key;
 	if (viewItem->getResourceKey(&key)) {
 		// Create a surface based on the key
 		_gameView->createSurface(key);
 	}
 }
- 
+
 void CMainGameWindow::draw() {
 	if (_gameManager) {
 		if (!_gameView->_surface) {
diff --git a/engines/titanic/messages/messages.cpp b/engines/titanic/messages/messages.cpp
index 5f587c975d..a8507063ff 100644
--- a/engines/titanic/messages/messages.cpp
+++ b/engines/titanic/messages/messages.cpp
@@ -91,7 +91,7 @@ const MSGMAP_ENTRY *CMessage::findMapEntry(const CTreeItem *treeItem, const Clas
 			for (const ClassDef *entryDef = entry->_class; entryDef; entryDef = entryDef->_parent) {
 				if (entryDef == classDef)
 					return entry;
-			}			
+			}
 		}
 	}
 
diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index 4fc4067a1a..b421e8ecb8 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -29,7 +29,7 @@
 
 namespace Titanic {
 
-enum MessageFlag { 
+enum MessageFlag {
 	MSGFLAG_SCAN = 1,
 	MSGFLAG_BREAK_IF_HANDLED = 2,
 	MSGFLAG_CLASS_DEF = 4
diff --git a/engines/titanic/messages/mouse_messages.cpp b/engines/titanic/messages/mouse_messages.cpp
index 18fa625c1c..888ca36187 100644
--- a/engines/titanic/messages/mouse_messages.cpp
+++ b/engines/titanic/messages/mouse_messages.cpp
@@ -29,7 +29,7 @@ namespace Titanic {
 void CMouseButtonDownMsg::generate() {
 	CInputHandler &inputHandler = *CScreenManager::_screenManagerPtr->_inputHandler;
 	const Point &mousePos = inputHandler._mousePos;
-	
+
 	CMouseButtonDownMsg msg(mousePos, MB_LEFT);
 	inputHandler.handleMessage(msg, false);
 }
diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h
index e7c419bbdc..a10f3b42a8 100644
--- a/engines/titanic/messages/mouse_messages.h
+++ b/engines/titanic/messages/mouse_messages.h
@@ -157,7 +157,7 @@ public:
 public:
 	CLASSDEF;
 	CPassOnDragStartMsg() : CMessage() {}
-	CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) : 
+	CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) :
 		CMessage(), _mousePos(pt), _value3(v3), _value4(v4) {}
 
 	static bool isSupportedBy(const CTreeItem *item) {
diff --git a/engines/titanic/moves/enter_exit_sec_class_mini_lift.cpp b/engines/titanic/moves/enter_exit_sec_class_mini_lift.cpp
index c7e16ef84e..6d1951b72b 100644
--- a/engines/titanic/moves/enter_exit_sec_class_mini_lift.cpp
+++ b/engines/titanic/moves/enter_exit_sec_class_mini_lift.cpp
@@ -63,7 +63,7 @@ bool CEnterExitSecClassMiniLift::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		_statics->_viewName = getRoomNodeName() + ".W";
 		changeView("SecClassLittleLift.Node 1.E");
 		_statics->_state = 1;
-		
+
 		CPetControl *pet = getPetControl();
 		if (pet) {
 			pet->setRoomsRoomNum(_roomNum);
diff --git a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h
index 839d2c04fa..a16122a591 100644
--- a/engines/titanic/moves/enter_exit_sec_class_mini_lift.h
+++ b/engines/titanic/moves/enter_exit_sec_class_mini_lift.h
@@ -46,7 +46,7 @@ public:
 	CEnterExitSecClassMiniLift() : CGameObject(), _roomNum(0) {}
 	static void init();
 	static void deinit();
-	
+
 	/**
 	 * Save the data for the class to file
 	 */
diff --git a/engines/titanic/moves/enter_exit_view.cpp b/engines/titanic/moves/enter_exit_view.cpp
index 6778ebb52a..a3f01f981a 100644
--- a/engines/titanic/moves/enter_exit_view.cpp
+++ b/engines/titanic/moves/enter_exit_view.cpp
@@ -31,7 +31,7 @@ BEGIN_MESSAGE_MAP(CEnterExitView, CGameObject)
 END_MESSAGE_MAP()
 
 CEnterExitView::CEnterExitView() : CGameObject(), _leaveEndFrame(0),
-	_leaveStartFrame(0), _enterEndFrame(0), _enterStartFrame(0), 
+	_leaveStartFrame(0), _enterEndFrame(0), _enterStartFrame(0),
 	_visibleAfterMovie(true) {
 }
 
diff --git a/engines/titanic/moves/exit_arboretum.cpp b/engines/titanic/moves/exit_arboretum.cpp
index ba162843b5..3c1591c393 100644
--- a/engines/titanic/moves/exit_arboretum.cpp
+++ b/engines/titanic/moves/exit_arboretum.cpp
@@ -32,7 +32,7 @@ BEGIN_MESSAGE_MAP(CExitArboretum, CMovePlayerTo)
 	ON_MESSAGE(TurnOff)
 END_MESSAGE_MAP()
 
-CExitArboretum::CExitArboretum() : CMovePlayerTo(), 
+CExitArboretum::CExitArboretum() : CMovePlayerTo(),
 		_seasonNum(0), _fieldCC(0), _enabled(true) {
 }
 
diff --git a/engines/titanic/moves/exit_pellerator.cpp b/engines/titanic/moves/exit_pellerator.cpp
index 3140d90b4c..3d1438a942 100644
--- a/engines/titanic/moves/exit_pellerator.cpp
+++ b/engines/titanic/moves/exit_pellerator.cpp
@@ -61,7 +61,7 @@ void CExitPellerator::load(SimpleFile *file) {
 
 bool CExitPellerator::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 	CString name = getName();
-	
+
 	if (name == "ExitPellerator") {
 		if (_statics->_v2 != 2) {
 			switch (getRandomNumber(2)) {
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp
index 2524a835f8..791adaa05c 100644
--- a/engines/titanic/npcs/barbot.cpp
+++ b/engines/titanic/npcs/barbot.cpp
@@ -142,7 +142,7 @@ void CBarbot::load(SimpleFile *file) {
 	_field158 = file->readNumber();
 	_field15C = file->readNumber();
 	_field160 = file->readNumber();
-	
+
 	CTrueTalkNPC::load(file);
 }
 
@@ -179,7 +179,7 @@ bool CBarbot::ActMsg(CActMsg *msg) {
 		statusMsg._newStatus = 2;
 		statusMsg.execute("PickUpGlass");
 		_field158 = 3;
-		
+
 		playRange(_frames[32], MOVIE_NOTIFY_OBJECT);
 		playRange(_frames[30], MOVIE_NOTIFY_OBJECT);
 		_frameNum = _frames[30]._endFrame;
@@ -317,7 +317,7 @@ bool CBarbot::TurnOn(CTurnOn *msg) {
 			playRange(_frames[23], MOVIE_NOTIFY_OBJECT);
 			playRange(_frames[21], MOVIE_NOTIFY_OBJECT);
 			_frameNum = _frames[21]._endFrame;
-		
+
 			switch (g_vm->getRandomNumber(2)) {
 			case 0:
 				playRange(_frames[10], MOVIE_NOTIFY_OBJECT);
@@ -575,7 +575,7 @@ bool CBarbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
 }
 
 bool CBarbot::FrameMsg(CFrameMsg *msg) {
-	if (!_fieldC4 || _frameNum != -1 || _field148 != -1 
+	if (!_fieldC4 || _frameNum != -1 || _field148 != -1
 			|| (msg->_ticks - _field14C) <= 5000
 			|| (msg->_ticks - _field150) <= 1000)
 		return true;
@@ -611,7 +611,7 @@ bool CBarbot::FrameMsg(CFrameMsg *msg) {
 			playRange(_frames[1], MOVIE_NOTIFY_OBJECT);
 			_field148 = _frames[1]._endFrame;
 			break;
-			
+
 		case 4:
 			playRange(_frames[3], MOVIE_NOTIFY_OBJECT);
 			_field148 = _frames[3]._endFrame;
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 0170491270..7aa32eeef3 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -74,7 +74,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
 			{ "MusicRoomLobby", "z#192.wav" },
 			{ "1stClassRestaurant", "z#190.wav" }
 		};
-		
+
 		int idx;
 		for (idx = 0; idx < 8; ++idx) {
 			if (compareRoomNameTo(ROOM_WAVES[idx][0])) {
diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp
index 4af9876b35..0979fa46f6 100644
--- a/engines/titanic/npcs/callbot.cpp
+++ b/engines/titanic/npcs/callbot.cpp
@@ -57,7 +57,7 @@ bool CCallBot::TurnOn(CTurnOn *msg) {
 bool CCallBot::EnterViewMsg(CEnterViewMsg *msg) {
 	if (_enabled) {
 		CRoomItem *room = getRoom();
-		
+
 		if (room) {
 			CSummonBotQueryMsg queryMsg;
 			queryMsg._npcName = _npcName;
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index 8f1fc28e20..c5032f1674 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -94,7 +94,7 @@ bool CDeskbot::EnterViewMsg(CEnterViewMsg *msg) {
 	_deskbotActive = false;
 	_fieldC4 = 0;
 	loadFrame(625);
-	
+
 	return true;
 }
 
@@ -264,7 +264,7 @@ bool CDeskbot::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMsg *m
 	default:
 		break;
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp
index 09444f5611..658b7c7123 100644
--- a/engines/titanic/npcs/maitre_d.cpp
+++ b/engines/titanic/npcs/maitre_d.cpp
@@ -156,7 +156,7 @@ bool CMaitreD::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 
 	if (msg->_value2 != 2) {
 		msg->_names = NAMES;
-		
+
 		CAnimateMaitreDMsg animMsg;
 		if (_field12C)
 			animMsg._value = 0;
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 6e7aa4ec57..358a86686f 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -116,13 +116,13 @@ CParrot::CParrot() : CTrueTalkNPC() {
 void CParrot::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_assetNumber, indent);
-	
+
 	file->writeQuotedLine(_assetName, indent);
 	file->writeNumberLine(_field108, indent);
 	file->writeNumberLine(_v1, indent);
 	file->writeNumberLine(_v2, indent);
 	file->writeNumberLine(_v3, indent);
-	
+
 	file->writeQuotedLine(_string2, indent);
 	file->writeNumberLine(_field118, indent);
 	file->writeNumberLine(_field11C, indent);
@@ -581,7 +581,7 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
 				actMsg.execute(_field134);
 			}
 
-			_npcFlags &= ~(NPCFLAG_10000 | NPCFLAG_20000 | NPCFLAG_40000 
+			_npcFlags &= ~(NPCFLAG_10000 | NPCFLAG_20000 | NPCFLAG_40000
 				| NPCFLAG_80000 | NPCFLAG_100000 | NPCFLAG_200000 | NPCFLAG_400000);
 			return true;
 		}
diff --git a/engines/titanic/npcs/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp
index d285c219b5..657bde5b66 100644
--- a/engines/titanic/npcs/parrot_succubus.cpp
+++ b/engines/titanic/npcs/parrot_succubus.cpp
@@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CParrotSuccUBus, CSuccUBus)
 	ON_MESSAGE(LeaveNodeMsg)
 END_MESSAGE_MAP()
 
-CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0), 
+CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0),
 	_field1EC(0), _field1F0(376), _field1F4(393) {
 }
 
@@ -43,7 +43,7 @@ void CParrotSuccUBus::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(_field1DC, indent);
 	file->writeQuotedLine(_string3, indent);
 	file->writeNumberLine(_field1EC, indent);
-	
+
 	CSuccUBus::save(file, indent);
 }
 
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 453f016757..6db8c8d798 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -183,7 +183,7 @@ void CSuccUBus::load(SimpleFile *file) {
 	_startFrame2 = file->readNumber();
 	_endFrame2 = file->readNumber();
 	_field140 = file->readNumber();
-	
+
 	_v2 = file->readNumber();
 	_startFrame5 = file->readNumber();
 	_endFrame5 = file->readNumber();
@@ -282,7 +282,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
 
 		CChicken *chicken = dynamic_cast<CChicken *>(item);
 		bool chickenFlag = chicken ? chicken->_string6 != "None" : false;
-		
+
 		item->setVisible(false);
 		if (_startFrame1 >= 0) {
 			playSound("z#23.wav");
@@ -353,7 +353,7 @@ bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) {
 		_enabled = false;
 		if (_startFrame10 >= 0)
 			playSound("z#27.wav", 100);
-		
+
 		if (_field15C)
 			setVisible(false);
 	}
@@ -397,7 +397,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 		petDisplayMessage(2, NOTHING_IN_SUCCUBUS_TRAY);
 	} else {
 		_field19C = 0;
-		
+
 		CRoomFlags roomFlags = _roomFlags;
 		if (!pet->testRooms5(roomFlags) || getPassengerClass() > 0) {
 			roomFlags = pet->getSpecialRoomFlags("BilgeRoom");
@@ -512,7 +512,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
 	if (msg->_endFrame == _endFrame10) {
 		if (_startFrame11 >= 0)
 			playSound("z#30.wav", 100);
-		
+
 		if (_field15C) {
 			_field15C = false;
 			setVisible(false);
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index 000595f6b7..aa92ddd166 100644
--- a/engines/titanic/npcs/titania.cpp
+++ b/engines/titanic/npcs/titania.cpp
@@ -159,7 +159,7 @@ bool CTitania::ActMsg(CActMsg *msg) {
 		CSenseWorkingMsg workingMsg2("Not Working");
 		CSenseWorkingMsg workingMsg3("Not Working");
 		CSenseWorkingMsg workingMsg4("Not Working");
-		
+
 		if (_eye1 && _eye2) {
 			workingMsg1._value = _visionCentre ? "Working" : "Random";
 		}
@@ -201,10 +201,10 @@ bool CTitania::EnterViewMsg(CEnterViewMsg *msg) {
 		_showIntro = false;
 		disableMouse();
 		petHide();
-		
+
 		CSetFrameMsg frameMsg;
 		frameMsg._frameNumber = 25;
-		frameMsg.execute("Bomb");	
+		frameMsg.execute("Bomb");
 		playCutscene(0, 52);
 
 		setVisible(false);
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 95438ce81e..4cdab24f6d 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -42,7 +42,7 @@ BEGIN_MESSAGE_MAP(CPetControl, CGameObject)
 	ON_MESSAGE(TimerMsg)
 END_MESSAGE_MAP()
 
-CPetControl::CPetControl() : CGameObject(), 
+CPetControl::CPetControl() : CGameObject(),
 		_currentArea(PET_CONVERSATION), _inputLockCount(0), _areaLockCount(0),
 		_areaChangeType(-1), _activeNPC(nullptr), _remoteTarget(nullptr),
 		_hiddenRoom(nullptr), _drawBounds(20, 350, 620, 480) {
@@ -68,12 +68,12 @@ void CPetControl::save(SimpleFile *file, int indent) {
 void CPetControl::load(SimpleFile *file) {
 	int val = file->readNumber();
 	isValid();
-	
+
 	if (!val) {
 		_currentArea = (PetArea)file->readNumber();
 		_activeNPCName = file->readString();
 		_remoteTargetName = file->readString();
-		
+
 		loadAreas(file, 0);
 	}
 
@@ -93,7 +93,7 @@ void CPetControl::setup() {
 
 bool CPetControl::isValid() {
 	return _conversations.isValid(this) &&
-		_rooms.isValid(this) && 
+		_rooms.isValid(this) &&
 		_remote.isValid(this) &&
 		_inventory.isValid(this) &&
 		_starfield.isValid(this) &&
@@ -427,7 +427,7 @@ void CPetControl::addToInventory(CGameObject *item) {
 	setArea(PET_INVENTORY);
 	if (_currentArea == PET_INVENTORY)
 		_inventory.highlightItem(item);
-	
+
 	makeDirty();
 	CPETGainedObjectMsg msg;
 	msg.execute(item);
@@ -471,7 +471,7 @@ bool CPetControl::checkNode(const CString &name) {
 		return true;
 	if (name == "NULL")
 		return false;
-	
+
 	CViewItem *view = gameManager->getView();
 	if (!view)
 		return true;
@@ -558,7 +558,7 @@ bool CPetControl::isBotInView(const CString &name) const {
 	CViewItem *view = gameManager->getView();
 	if (!view)
 		return false;
-	
+
 	// Iterate to find NPC
 	for (CTreeItem *child = view->getFirstChild(); child; child = child->scan(view)) {
 		CGameObject *gameObject = dynamic_cast<CGameObject *>(child);
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index 454fc0991b..d42dff598c 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -340,12 +340,12 @@ public:
 	 * Returns true if all input is currently locked (disabled)
 	 */
 	bool isInputLocked() const { return _inputLockCount > 0; }
-	
+
 	/**
 	 * Increments the input locked count
 	 */
 	void incInputLocks() { ++_inputLockCount; }
-	
+
 	/**
 	 * Decremenst the input locked count
 	 */
@@ -364,7 +364,7 @@ public:
 	/**
 	 * Decrement the number of PET area (tab) locks
 	 */
-	void decAreaLocks() { 
+	void decAreaLocks() {
 		_areaLockCount = MAX(_areaLockCount - 1, 0);
 	}
 
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 173c586fc1..58dcd57384 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -60,7 +60,7 @@ bool CPetConversations::reset() {
 	_dials[0].setup(MODE_UNSELECTED, "3PetDial1", _petControl);
 	_dials[1].setup(MODE_UNSELECTED, "3PetDial2", _petControl);
 	_dials[2].setup(MODE_UNSELECTED, "3PetDial3", _petControl);
-	
+
 	_dialBackground.reset("PetDialBack", _petControl);
 	_scrollUp.reset("PetScrollUp", _petControl);
 	_scrollDown.reset("PetScrollDown", _petControl);
@@ -334,7 +334,7 @@ bool CPetConversations::setupControl(CPetControl *petControl) {
 
 		_dialBackground.setBounds(Rect(0, 0, 21, 130));
 		_dialBackground.translate(20, 350);
-		
+
 		const Rect rect1(0, 0, 22, 36);
 		_dials[0].setBounds(rect1);
 		_dials[0].translate(20, 359);
diff --git a/engines/titanic/pet_control/pet_conversations.h b/engines/titanic/pet_control/pet_conversations.h
index 3333bdc523..efb7db4277 100644
--- a/engines/titanic/pet_control/pet_conversations.h
+++ b/engines/titanic/pet_control/pet_conversations.h
@@ -136,7 +136,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -146,12 +146,12 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-	
+
 	/**
 	 * Get the bounds for the section
 	 */
 	virtual Rect getBounds() const;
-	
+
 	/**
 	 * Returns true if the object is in a valid state
 	 */
@@ -190,7 +190,7 @@ public:
 	 * Called when a section is switched to
 	 */
 	virtual void enter(PetArea oldArea);
-	
+
 	/**
 	 * Called when a section is being left, to switch to another area
 	 */
@@ -220,7 +220,7 @@ public:
 	 * Show the text cursor
 	 */
 	virtual void showCursor();
-	
+
 	/**
 	 * Hide the text cursor
 	 */
diff --git a/engines/titanic/pet_control/pet_frame.cpp b/engines/titanic/pet_control/pet_frame.cpp
index 7375c69436..e8244cf2d7 100644
--- a/engines/titanic/pet_control/pet_frame.cpp
+++ b/engines/titanic/pet_control/pet_frame.cpp
@@ -97,7 +97,7 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
 		// Set the bounds of the individual elements
 		_background.setBounds(Rect(20, 350, 620, 480));
 		_modeBackground.setBounds(Rect(590, 365, 611, 467));
-		
+
 		// Squares used for holding glyphs in various tabs
 		Rect r(35, 373, 91, 429);
 		for (int idx = 0, xp = 0; idx < TOTAL_GLYPHS; ++idx, xp += 70) {
@@ -113,7 +113,7 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
 			_modeButtons[idx].translate(4, YLIST[idx]);
 		}
 		_modeButtons[PET_AREAS[0]].setMode(MODE_SELECTED);
-		
+
 		const int XLIST[] = { 73, 54, 85, 109, 38, 71 };
 		for (int idx = 0; idx < 6; ++idx) {
 			_titles[idx].setBounds(Rect(0, 0, 110, 11));
diff --git a/engines/titanic/pet_control/pet_frame.h b/engines/titanic/pet_control/pet_frame.h
index d8924e83d3..720112c1c0 100644
--- a/engines/titanic/pet_control/pet_frame.h
+++ b/engines/titanic/pet_control/pet_frame.h
@@ -53,12 +53,12 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Sets up the section
 	 */
 	virtual bool reset();
-	
+
 	/**
 	 * Handles mouse down messages
 	 */
diff --git a/engines/titanic/pet_control/pet_gfx_element.cpp b/engines/titanic/pet_control/pet_gfx_element.cpp
index 6022885770..e43c847bb1 100644
--- a/engines/titanic/pet_control/pet_gfx_element.cpp
+++ b/engines/titanic/pet_control/pet_gfx_element.cpp
@@ -48,7 +48,7 @@ void CPetGfxElement::reset(const CString &name, CPetControl *petControl, PetElem
 	if (!petControl)
 		return;
 
-	CString numString(3);	
+	CString numString(3);
 	int classNum = petControl->getPassengerClass();
 
 	if (classNum >= 1 && classNum <= 3) {
diff --git a/engines/titanic/pet_control/pet_glyphs.h b/engines/titanic/pet_control/pet_glyphs.h
index c07cc5ed9a..79e032162c 100644
--- a/engines/titanic/pet_control/pet_glyphs.h
+++ b/engines/titanic/pet_control/pet_glyphs.h
@@ -77,7 +77,7 @@ public:
 	 * Called when the PET area is entered
 	 */
 	virtual void enter() {}
-	
+
 	/**
 	 * Called when the PET area is left
 	 */
@@ -137,7 +137,7 @@ public:
 	 * Handles keypresses
 	 */
 	virtual bool KeyCharMsg(int key) { return false; }
-	
+
 	/**
 	 * Handles keypresses
 	 */
@@ -162,7 +162,7 @@ public:
 	 * Selects a glyph
 	 */
 	virtual void selectGlyph(const Point &topLeft, const Point &pt) {}
-	
+
 	/**
 	 * Called when a glyph drag starts
 	 */
@@ -195,7 +195,7 @@ public:
 	 * Called on a highlighted item when PET area is entered
 	 */
 	virtual bool enterHighlighted() { return false; }
-	
+
 	/**
 	 * Called on a highlighted item when PET area is left
 	 */
@@ -241,7 +241,7 @@ public:
 	 */
 	bool isHighlighted() const;
 };
-		
+
 class CPetGlyphs : public List<CPetGlyph> {
 private:
 	/**
diff --git a/engines/titanic/pet_control/pet_inventory.cpp b/engines/titanic/pet_control/pet_inventory.cpp
index 88310459c6..be01146398 100644
--- a/engines/titanic/pet_control/pet_inventory.cpp
+++ b/engines/titanic/pet_control/pet_inventory.cpp
@@ -53,7 +53,7 @@ void CPetInventory::draw(CScreenManager *screenManager) {
 	_text.draw(screenManager);
 }
 
-Rect CPetInventory::getBounds() const { 
+Rect CPetInventory::getBounds() const {
 	return _movie ? _movie->getBounds() : Rect();
 }
 
@@ -231,7 +231,7 @@ CGameObject *CPetInventory::getImage(int index) {
 			return _itemGlyphs[index];
 		}
 	}
-	
+
 	return nullptr;
 }
 
diff --git a/engines/titanic/pet_control/pet_inventory.h b/engines/titanic/pet_control/pet_inventory.h
index 184bb20385..5433feae95 100644
--- a/engines/titanic/pet_control/pet_inventory.h
+++ b/engines/titanic/pet_control/pet_inventory.h
@@ -64,7 +64,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Sets up the section
 	 */
@@ -74,12 +74,12 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-	
+
 	/**
 	 * Get the bounds for the section
 	 */
 	virtual Rect getBounds() const;
-	
+
 	/**
 	 * Called when a general change occurs
 	 */
@@ -141,7 +141,7 @@ public:
 	virtual CGameObject *getBackground(int index) const;
 
 	/**
-	 * 
+	 *
 	 */
 	void change(CGameObject *item);
 
diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.h b/engines/titanic/pet_control/pet_inventory_glyphs.h
index 0d167c4c98..508db67f2d 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.h
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.h
@@ -63,7 +63,7 @@ public:
 	CGameObject *_background;
 	CGameObject *_image;
 public:
-	CPetInventoryGlyph() : _item(nullptr), _field34(1), 
+	CPetInventoryGlyph() : _item(nullptr), _field34(1),
 		_background(nullptr), _image(nullptr) {}
 	CPetInventoryGlyph(CCarry *item, int val) : _item(item),
 		_field34(val), _background(nullptr), _image(nullptr) {}
@@ -72,7 +72,7 @@ public:
 	 * Called when the PET area is entered
 	 */
 	virtual void enter();
-	
+
 	/**
 	 * Called when the PET area is left
 	 */
@@ -97,7 +97,7 @@ public:
 	 * Glyph has been shifted to be first visible one
 	 */
 	virtual void glyphFocused(const Point &topLeft, bool flag);
-	
+
 	/**
 	 * Called when a glyph drag starts
 	 */
@@ -133,7 +133,7 @@ class CInventoryGlyphAction : public CGlyphAction {
 public:
 	CGameObject *_item;
 public:
-	CInventoryGlyphAction(CGameObject *item, GlyphActionMode mode) : 
+	CInventoryGlyphAction(CGameObject *item, GlyphActionMode mode) :
 		CGlyphAction(mode), _item(item) {}
 };
 
diff --git a/engines/titanic/pet_control/pet_load.cpp b/engines/titanic/pet_control/pet_load.cpp
index 8e2afc727f..3d67cf6d71 100644
--- a/engines/titanic/pet_control/pet_load.cpp
+++ b/engines/titanic/pet_control/pet_load.cpp
@@ -30,7 +30,7 @@ namespace Titanic {
 
 bool CPetLoad::reset() {
 	CPetLoadSave::reset();
-	
+
 	CPetControl *pet = getPetControl();
 	if (pet) {
 		setName("PetLoad", pet);
diff --git a/engines/titanic/pet_control/pet_load.h b/engines/titanic/pet_control/pet_load.h
index 421531974d..5669991b59 100644
--- a/engines/titanic/pet_control/pet_load.h
+++ b/engines/titanic/pet_control/pet_load.h
@@ -33,7 +33,7 @@ public:
 	 * Reset the glyph
 	 */
 	virtual bool reset();
-	
+
 	/**
 	 * Handles mouse button up messages
 	 */
diff --git a/engines/titanic/pet_control/pet_load_save.cpp b/engines/titanic/pet_control/pet_load_save.cpp
index aebe43551e..136953cab7 100644
--- a/engines/titanic/pet_control/pet_load_save.cpp
+++ b/engines/titanic/pet_control/pet_load_save.cpp
@@ -76,7 +76,7 @@ void CPetLoadSave::draw2(CScreenManager *screenManager) {
 bool CPetLoadSave::MouseButtonDownMsg(const Point &pt) {
 	if (_btnLoadSave.MouseButtonDownMsg(pt))
 		return true;
-	
+
 	checkSlotsHighlight(pt);
 	return false;
 }
@@ -95,7 +95,7 @@ bool CPetLoadSave::KeyCharMsg(int key) {
 	case Common::KEYCODE_UP:
 	case Common::KEYCODE_KP8:
 		if (_savegameSlotNum != -1) {
-			int slotNum = --_savegameSlotNum;			
+			int slotNum = --_savegameSlotNum;
 			highlightSlot((slotNum == -1) ? SAVEGAME_SLOTS_COUNT - 1 : slotNum);
 			getPetControl()->makeDirty();
 		}
diff --git a/engines/titanic/pet_control/pet_quit.cpp b/engines/titanic/pet_control/pet_quit.cpp
index 218ed89812..a6fb22d7e1 100644
--- a/engines/titanic/pet_control/pet_quit.cpp
+++ b/engines/titanic/pet_control/pet_quit.cpp
@@ -41,7 +41,7 @@ bool CPetQuit::setup(CPetControl *petControl, CPetGlyphs *owner) {
 	Rect btnRect(0, 0, 68, 52);
 	btnRect.moveTo(496, 388);
 	_btnYes.setBounds(btnRect);
-	
+
 	return true;
 }
 
@@ -52,7 +52,7 @@ bool CPetQuit::reset() {
 
 	setName("PetExit", pet);
 
-	uint col = getPetSection()->getColor(0);	
+	uint col = getPetSection()->getColor(0);
 	_text.setText("Are you sure you want to quit?");
 	_text.setLineColor(0, col);
 
diff --git a/engines/titanic/pet_control/pet_quit.h b/engines/titanic/pet_control/pet_quit.h
index 87d8aefbbf..b775000933 100644
--- a/engines/titanic/pet_control/pet_quit.h
+++ b/engines/titanic/pet_control/pet_quit.h
@@ -58,7 +58,7 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
diff --git a/engines/titanic/pet_control/pet_real_life.h b/engines/titanic/pet_control/pet_real_life.h
index 40bc87d9b5..b359d285c8 100644
--- a/engines/titanic/pet_control/pet_real_life.h
+++ b/engines/titanic/pet_control/pet_real_life.h
@@ -53,7 +53,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -63,12 +63,12 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-	
+
 	/**
 	 * Get the bounds for the section
 	 */
 	virtual Rect getBounds() const { return Rect(); }
-	
+
 	/**
 	 * Following are handlers for the various messages that the PET can
 	 * pass onto the currently active section/area
@@ -85,7 +85,7 @@ public:
 	 * Returns item a drag-drop operation has dropped on, if any
 	 */
 	virtual CGameObject *dragEnd(const Point &pt) const { return nullptr; }
-	
+
 	/**
 	 * Display a message
 	 */
@@ -115,7 +115,7 @@ public:
 	 * Called when a section is switched to
 	 */
 	virtual void enter(PetArea oldArea);
-	
+
 	/**
 	 * Called when a section is being left, to switch to another area
 	 */
diff --git a/engines/titanic/pet_control/pet_remote.cpp b/engines/titanic/pet_control/pet_remote.cpp
index 9b43b8dab9..7e98308114 100644
--- a/engines/titanic/pet_control/pet_remote.cpp
+++ b/engines/titanic/pet_control/pet_remote.cpp
@@ -30,7 +30,7 @@
 namespace Titanic {
 
 static const byte REMOTE_DATA[] = {
-	0x00, 0x02, 
+	0x00, 0x02,
 		GLYPH_SUMMON_ELEVATOR, GLYPH_SUCCUBUS_DELIVERY,
 	0x01, 0x02,
 		GLYPH_SUMMON_PELLERATOR, GLYPH_SUCCUBUS_DELIVERY,
@@ -83,7 +83,7 @@ static const byte REMOTE_DATA[] = {
 		GLYPH_SUMMON_ELEVATOR, GLYPH_SUCCUBUS_DELIVERY,
 	0x1E, 0x0C,
 		GLYPH_DEPLOY_FLORAL, GLYPH_DEPLOY_FULLY_RELAXATION, GLYPH_DEPLOY_COMFORT,
-		GLYPH_DEPLOY_MINOR_STORAGE, GLYPH_ENTERTAINMENT_DEVICE, 
+		GLYPH_DEPLOY_MINOR_STORAGE, GLYPH_ENTERTAINMENT_DEVICE,
 		GLYPH_DEPLOY_MAJOR_RELAXATION, GLYPH_INFLATE_RELAXATION,
 		GLYPH_DEPLOY_MAINTENANCE, GLYPH_DEPLOY_WORK_SURFACE,
 		GLYPH_DEPLOY_MINOR_RELAXATION, GLYPH_DEPLOY_SINK,
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index 953428ff0c..aa756bc941 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -68,7 +68,7 @@ void CBasicRemoteGlyph::draw2(CScreenManager *screenManager) {
 }
 
 bool CBasicRemoteGlyph::MouseButtonDownMsg(const Point &pt) {
-	return _gfxElement && _gfxElement->MouseButtonDownMsg(pt); 
+	return _gfxElement && _gfxElement->MouseButtonDownMsg(pt);
 }
 
 bool CBasicRemoteGlyph::MouseButtonUpMsg(const Point &pt) {
@@ -173,7 +173,7 @@ bool CTelevisionControlGlyph::setup(CPetControl *petControl, CPetGlyphs *owner)
 		_down = getElement(2);
 		_onOff = getElement(4);
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index d3541d6a94..6114c81a9f 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -90,7 +90,7 @@ private:
 	CString _gfxName, _tooltip, _msgString;
 public:
 	CBasicRemoteGlyph(const CString &gfxName, const CString &tooltip,
-		const CString &msgString) : CPetRemoteGlyph(), 
+		const CString &msgString) : CPetRemoteGlyph(),
 		_gfxName(gfxName), _tooltip(tooltip), _msgString(msgString) {}
 
 	/**
@@ -112,7 +112,7 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
@@ -144,7 +144,7 @@ public:
 	/**
 	 * Called for mouse button up messages to the default element
 	 */
-	bool elementMouseButtonUpMsg(const Point &pt, int petNum);	
+	bool elementMouseButtonUpMsg(const Point &pt, int petNum);
 };
 
 class CRemoteGotoGlyph : public CPetRemoteGlyph {
@@ -154,7 +154,7 @@ protected:
 	CString _gfxName, _tooltip;
 public:
 	CRemoteGotoGlyph() : CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21) {}
-	CRemoteGotoGlyph(const CString &gfxName, const CString &tooltip) : 
+	CRemoteGotoGlyph(const CString &gfxName, const CString &tooltip) :
 		CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21),
 		_gfxName(gfxName), _tooltip(tooltip) {}
 
@@ -177,7 +177,7 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
@@ -223,7 +223,7 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
@@ -257,7 +257,7 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
@@ -318,7 +318,7 @@ public:
 	virtual bool MouseButtonUpMsg(const Point &pt) {
 		return elementMouseButtonUpMsg(pt, 0);
 	}
-	
+
 	/**
 	 * Returns the tooltip text for when the glyph is selected
 	 */
diff --git a/engines/titanic/pet_control/pet_rooms.h b/engines/titanic/pet_control/pet_rooms.h
index af1ea2ae4f..28d6553a33 100644
--- a/engines/titanic/pet_control/pet_rooms.h
+++ b/engines/titanic/pet_control/pet_rooms.h
@@ -76,7 +76,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -86,7 +86,7 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-		
+
 	/**
 	 * Following are handlers for the various messages that the PET can
 	 * pass onto the currently active section/area
@@ -101,7 +101,7 @@ public:
 	 * Check whether a drag drop can occur
 	 */
 	virtual bool checkDragEnd(CGameObject *item);
-	
+
 	/**
 	 * Display a message
 	 */
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.h b/engines/titanic/pet_control/pet_rooms_glyphs.h
index 5d0fec84f8..11de6c4a8e 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.h
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.h
@@ -94,7 +94,7 @@ public:
 	 * Saves the data for the glyph
 	 */
 	virtual void saveGlyph(SimpleFile *file, int indent);
-	
+
 	virtual bool proc33(CPetGlyph *glyph);
 
 	/**
@@ -125,12 +125,12 @@ public:
 	 * Returns true if the room is either currently or previously assigned
 	 */
 	bool isAssigned() const { return _mode != RGM_UNASSIGNED; }
-	
+
 	/**
 	 * Returns true if the room is the one currently assigned to the player
 	 */
 	bool isCurrentlyAssigned() const { return _mode == RGM_ASSIGNED_ROOM; }
-	
+
 	/**
 	 * Returns true if the room was previously assigned to the player
 	 */
diff --git a/engines/titanic/pet_control/pet_save.cpp b/engines/titanic/pet_control/pet_save.cpp
index 6d0733f534..d344c8cd14 100644
--- a/engines/titanic/pet_control/pet_save.cpp
+++ b/engines/titanic/pet_control/pet_save.cpp
@@ -28,7 +28,7 @@ namespace Titanic {
 
 bool CPetSave::reset() {
 	CPetLoadSave::reset();
-	
+
 	CPetControl *pet = getPetControl();
 	if (pet) {
 		setName("PetSave", pet);
diff --git a/engines/titanic/pet_control/pet_save.h b/engines/titanic/pet_control/pet_save.h
index 54e91e4c76..e5e956403f 100644
--- a/engines/titanic/pet_control/pet_save.h
+++ b/engines/titanic/pet_control/pet_save.h
@@ -57,11 +57,11 @@ public:
 	/**
 	 * Called on a highlighted item when PET area is entered
 	 */
-	virtual bool enterHighlighted() { 
+	virtual bool enterHighlighted() {
 		highlightSave(_savegameSlotNum);
 		return true;
 	}
-	
+
 	/**
 	 * Called on a highlighted item when PET area is left
 	 */
diff --git a/engines/titanic/pet_control/pet_section.h b/engines/titanic/pet_control/pet_section.h
index dc2f70b76f..9e9afe6c21 100644
--- a/engines/titanic/pet_control/pet_section.h
+++ b/engines/titanic/pet_control/pet_section.h
@@ -75,7 +75,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl) { return false; }
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -85,17 +85,17 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager) {}
-	
+
 	/**
 	 * Get the bounds for the section
 	 */
 	virtual Rect getBounds() const { return Rect(); }
-	
+
 	/**
 	 * Called when a general change occurs
 	 */
 	virtual void changed(int changeType) {}
-	
+
 	/**
 	 * Following are handlers for the various messages that the PET can
 	 * pass onto the currently active section/area
@@ -113,12 +113,12 @@ public:
 	 * Check whether a drag drop can occur
 	 */
 	virtual bool checkDragEnd(CGameObject *item) { return false; }
-	
+
 	/**
 	 * Returns item a drag-drop operation has dropped on, if any
 	 */
 	virtual CGameObject *dragEnd(const Point &pt) const { return nullptr; }
-	
+
 	/**
 	 * Display a message
 	 */
@@ -148,12 +148,12 @@ public:
 	 * Called when a section is switched to
 	 */
 	virtual void enter(PetArea oldArea) {}
-	
+
 	/**
 	 * Called when a section is being left, to switch to another area
 	 */
 	virtual void leave() {}
-	
+
 	virtual void proc23() {}
 
 	/**
@@ -175,7 +175,7 @@ public:
 	 * Removes text after a given duration
 	 */
 	virtual void removeText(int duration);
-	
+
 	/**
 	 * Removes text after a given duration
 	 */
@@ -217,7 +217,7 @@ public:
 	 * Show the text cursor
 	 */
 	virtual void showCursor() {}
-	
+
 	/**
 	 * Hide the text cursor
 	 */
@@ -237,7 +237,7 @@ public:
 	 * Get a specified color in the currently active UI color table
 	 */
 	uint getColor(uint index);
-	
+
 	/**
 	 * Get one of the game's three UI color tables. If the default
 	 * tableNum of -1 is used, the table is taken from the game state
diff --git a/engines/titanic/pet_control/pet_slider.h b/engines/titanic/pet_control/pet_slider.h
index 0bc9e825cd..be8c846a20 100644
--- a/engines/titanic/pet_control/pet_slider.h
+++ b/engines/titanic/pet_control/pet_slider.h
@@ -106,7 +106,7 @@ public:
 	 * Reset the slider
 	 */
 	virtual void reset(const CString &name) {}
-	
+
 	/**
 	 * Draw the slider
 	 */
@@ -116,7 +116,7 @@ public:
 	 * Reset the dirty area
 	 */
 	virtual Rect clearDirtyArea();
-	
+
 	/**
 	 * Checks whether the slider is highlighted
 	 */
@@ -131,7 +131,7 @@ public:
 	 * Handles dragging the slider
 	 */
 	virtual bool MouseDragMoveMsg(const Point &pt);
-	
+
 	/**
 	 * Called when a slider drag ends
 	 */
@@ -144,8 +144,8 @@ public:
 
 	virtual bool proc13() { return false; }
 	virtual bool proc14() { return false; }
-	
-	
+
+
 	virtual bool contains(const Point &pt) const;
 
 	/**
diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp
index 7bfeb25722..e9958c67be 100644
--- a/engines/titanic/pet_control/pet_sound.cpp
+++ b/engines/titanic/pet_control/pet_sound.cpp
@@ -111,7 +111,7 @@ bool CPetSound::reset() {
 
 void CPetSound::draw2(CScreenManager *screenManager) {
 	_element.draw(screenManager);
-	
+
 	_musicVolume.draw(screenManager);
 	_masterVolume.draw(screenManager);
 	_parrotVolume.draw(screenManager);
@@ -173,7 +173,7 @@ void CPetSound::sliderChanged(double offset, int sliderNum) {
 	CPetControl *pet = getPetControl();
 	if (!pet)
 		return;
-	
+
 	CGameManager *gameManager = pet->getGameManager();
 	if (!gameManager)
 		return;
diff --git a/engines/titanic/pet_control/pet_starfield.cpp b/engines/titanic/pet_control/pet_starfield.cpp
index 3287f98817..dd953b592d 100644
--- a/engines/titanic/pet_control/pet_starfield.cpp
+++ b/engines/titanic/pet_control/pet_starfield.cpp
@@ -45,7 +45,7 @@ bool CPetStarfield::reset() {
 		_btnSetDest.setup(MODE_UNSELECTED, "3PetSetDestin", _petControl);
 		_btnSetDest.setup(MODE_SELECTED, "3PetSetDestin1", _petControl);
 		_imgStarCtrl.setup(MODE_UNSELECTED, "3PetStarCtrl", _petControl);
-		
+
 		_leds[0].setup(MODE_UNSELECTED, "LEDOff1", _petControl);
 		_leds[1].setup(MODE_UNSELECTED, "LEDOn1", _petControl);
 		_leds[2].setup(MODE_UNSELECTED, "LEDOff2", _petControl);
@@ -106,7 +106,7 @@ bool CPetStarfield::MouseButtonUpMsg(CMouseButtonUpMsg *msg) {
 
 	if (_petControl) {
 		CStarControl *starControl = _petControl->getStarControl();
-		
+
 		if (starControl && starControl->canSetStarDestination()) {
 			CPETSetStarDestinationMsg starfieldMsg;
 			starfieldMsg.execute(_petControl->_remoteTarget);
diff --git a/engines/titanic/pet_control/pet_starfield.h b/engines/titanic/pet_control/pet_starfield.h
index 9550e0acf9..6c47f47d67 100644
--- a/engines/titanic/pet_control/pet_starfield.h
+++ b/engines/titanic/pet_control/pet_starfield.h
@@ -66,7 +66,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -76,7 +76,7 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-	
+
 	/**
 	* Following are handlers for the various messages that the PET can
 	* pass onto the currently active section/area
diff --git a/engines/titanic/pet_control/pet_text.cpp b/engines/titanic/pet_control/pet_text.cpp
index 2c20396cd9..1aa9b804ff 100644
--- a/engines/titanic/pet_control/pet_text.cpp
+++ b/engines/titanic/pet_control/pet_text.cpp
@@ -27,7 +27,7 @@ namespace Titanic {
 CPetText::CPetText(uint count) :
 		_stringsMerged(false), _maxCharsPerLine(-1), _lineCount(0),
 		_linesStart(-1), _unused1(0), _unused2(0), _unused3(0),
-		_backR(0xff), _backG(0xff), _backB(0xff), 
+		_backR(0xff), _backG(0xff), _backB(0xff),
 		_textR(0), _textG(0), _textB(200),
 		_fontNumber(0), _npcFlag(0), _npcId(0), _hasBorder(true),
 		_scrollTop(0), _textCursor(nullptr) {
@@ -110,7 +110,7 @@ void CPetText::load(SimpleFile *file, int param) {
 			_array[idx]._line = file->readString();
 			_array[idx]._rgb = file->readString();
 			_array[idx]._string3 = file->readString();
-		}	
+		}
 	}
 }
 
@@ -225,7 +225,7 @@ void CPetText::appendText(const CString &str) {
 		// Only add part of the str up to the maximum allowed limit for line
 		_array[_lineCount]._line += str.left(_maxCharsPerLine - lineSize);
 	}
-	
+
 	updateStr3(_lineCount);
 	_stringsMerged = false;
 }
@@ -260,7 +260,7 @@ void CPetText::remapColors(uint count, uint *srcColors, uint *destColors) {
 			}
 		}
 	}
-	
+
 	_stringsMerged = false;
 }
 
@@ -277,7 +277,7 @@ void CPetText::updateStr3(int lineNum) {
 		line[2] = _npcId;
 		line[4] = '\0';
 		_array[lineNum]._string3 = CString(line);
-		
+
 		_stringsMerged = false;
 		_npcFlag = _npcId = 0;
 	}
@@ -470,7 +470,7 @@ int CPetText::getNPCNum(uint npcId, uint startIndex) {
 			strP += 4;
 		}
 	}
-	
+
 	return - 1;
 }
 
diff --git a/engines/titanic/pet_control/pet_translation.h b/engines/titanic/pet_control/pet_translation.h
index 2fcc758b44..26070d6e59 100644
--- a/engines/titanic/pet_control/pet_translation.h
+++ b/engines/titanic/pet_control/pet_translation.h
@@ -44,7 +44,7 @@ public:
 	 * Sets up the section
 	 */
 	virtual bool setup(CPetControl *petControl);
-	
+
 	/**
 	 * Reset the section
 	 */
@@ -54,7 +54,7 @@ public:
 	 * Draw the section
 	 */
 	virtual void draw(CScreenManager *screenManager);
-	
+
 	/**
 	 * Following are handlers for the various messages that the PET can
 	 * pass onto the currently active section/area
diff --git a/engines/titanic/sound/auto_music_player_base.cpp b/engines/titanic/sound/auto_music_player_base.cpp
index ad8b848c03..49ae906e91 100644
--- a/engines/titanic/sound/auto_music_player_base.cpp
+++ b/engines/titanic/sound/auto_music_player_base.cpp
@@ -71,7 +71,7 @@ bool CAutoMusicPlayerBase::TimerMsg(CTimerMsg *msg) {
 bool CAutoMusicPlayerBase::LoadSuccessMsg(CLoadSuccessMsg *msg) {
 	if (_isRepeated)
 		playGlobalSound(_filename, _volumeMode, _initialMute, true, 0);
-	
+
 	return true;
 }
 
diff --git a/engines/titanic/sound/enter_view_toggles_other_music.cpp b/engines/titanic/sound/enter_view_toggles_other_music.cpp
index 2f0091a0a3..2d23043d83 100644
--- a/engines/titanic/sound/enter_view_toggles_other_music.cpp
+++ b/engines/titanic/sound/enter_view_toggles_other_music.cpp
@@ -28,7 +28,7 @@ BEGIN_MESSAGE_MAP(CEnterViewTogglesOtherMusic, CTriggerAutoMusicPlayer)
 	ON_MESSAGE(EnterViewMsg)
 END_MESSAGE_MAP()
 
-CEnterViewTogglesOtherMusic::CEnterViewTogglesOtherMusic() : 
+CEnterViewTogglesOtherMusic::CEnterViewTogglesOtherMusic() :
 		CTriggerAutoMusicPlayer(), _value(2) {
 }
 
diff --git a/engines/titanic/sound/proximity.cpp b/engines/titanic/sound/proximity.cpp
index ee1cd3e741..796e344ae2 100644
--- a/engines/titanic/sound/proximity.cpp
+++ b/engines/titanic/sound/proximity.cpp
@@ -27,8 +27,8 @@ namespace Titanic {
 
 CProximity::CProximity() : _channelVolume(100), _balance(0),
 		_priorSoundHandle(-1), _frequencyMultiplier(0.0), _frequencyAdjust(1.875),
-		_repeated(false), _channelMode(10), _positioningMode(POSMODE_NONE), 
-		_azimuth(0.0), _range(0.5), _elevation(0), 
+		_repeated(false), _channelMode(10), _positioningMode(POSMODE_NONE),
+		_azimuth(0.0), _range(0.5), _elevation(0),
 		_posX(0.0), _posY(0.0), _posZ(0.0),
 		_hasVelocity(false), _velocityX(0), _velocityY(0), _velocityZ(0),
 		_disposeAfterUse(DisposeAfterUse::NO), _endTalkerFn(nullptr), _talker(nullptr),
diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp
index c095b84e17..733164947e 100644
--- a/engines/titanic/sound/qmixer.cpp
+++ b/engines/titanic/sound/qmixer.cpp
@@ -31,7 +31,7 @@ QMixer::QMixer(Audio::Mixer *mixer) : _mixer(mixer) {
 bool QMixer::qsWaveMixInitEx(const QMIXCONFIG &config) {
 	assert(_channels.empty());
 	assert(config.iChannels > 0 && config.iChannels < 256);
-	
+
 	_channels.resize(config.iChannels);
 	return true;
 }
@@ -71,7 +71,7 @@ void QMixer::qsWaveMixSetPanRate(int iChannel, uint flags, uint rate) {
 
 void QMixer::qsWaveMixSetVolume(int iChannel, uint flags, uint volume) {
 	ChannelEntry &channel = _channels[iChannel];
-	
+
 	// QMixer volumes go from 0-32767, but we need to convert to 0-255 for ScummVM
 	assert(volume <= 32767);
 	byte newVolume = (volume >= 32700) ? 255 : volume * 255 / 32767;
@@ -149,7 +149,7 @@ void QMixer::qsWaveMixPump() {
 		if (channel._volumeChangeEnd) {
 			byte oldVolume = channel._volume;
 			uint currentTicks = g_system->getMillis();
-			
+
 			if (currentTicks >= channel._volumeChangeEnd) {
 				// Reached end of transition period
 				channel._volume = channel._volumeEnd;
diff --git a/engines/titanic/sound/qmixer.h b/engines/titanic/sound/qmixer.h
index 6a25484c29..9a0ea85ede 100644
--- a/engines/titanic/sound/qmixer.h
+++ b/engines/titanic/sound/qmixer.h
@@ -156,7 +156,7 @@ struct QMIXPLAYPARAMS {
 	Audio::Mixer::SoundType _soundType;
 
 	QMIXPLAYPARAMS() : dwSize(36), lpImage(nullptr), hwndNotify(0), callback(nullptr),
-		dwUser(nullptr), lStart(0), lStartLoop(0), lEndLoop(0), lEnd(0), 
+		dwUser(nullptr), lStart(0), lStartLoop(0), lEndLoop(0), lEnd(0),
 		lpChannelParams(nullptr), _soundType(Audio::Mixer::kPlainSoundType)  {}
 };
 
@@ -165,7 +165,7 @@ struct QMIXPLAYPARAMS {
  * QSound Labs, Inc. Which itself is apparently based on Microsoft's
  * WaveMix API.
  *
- * It does not currently have any actual code from the library, 
+ * It does not currently have any actual code from the library,
  * and instead remaps calls to ScummVM's existing mixer where possible.
  * This means that advanced features of the QMixer library, like being
  * able to set up both the player and sounds at different positions are
@@ -189,7 +189,7 @@ class QMixer {
 		// Currently playing and any following queued sounds for the channel
 		Common::List<SoundEntry> _sounds;
 		// Current channel volume
-		byte _volume;				
+		byte _volume;
 		// Current time in milliseconds for paning (volume) changes
 		uint _panRate;
 		// Fields used to transition between volume levels
diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h
index a57e133eb6..1c3394ce15 100644
--- a/engines/titanic/sound/room_trigger_auto_music_player.h
+++ b/engines/titanic/sound/room_trigger_auto_music_player.h
@@ -31,7 +31,7 @@ namespace Titanic {
 class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer {
 	DECLARE_MESSAGE_MAP;
 	bool LeaveRoomMsg(CLeaveRoomMsg *msg);
-	bool EnterRoomMsg(CEnterRoomMsg *msg);	
+	bool EnterRoomMsg(CEnterRoomMsg *msg);
 public:
 	CLASSDEF;
 
diff --git a/engines/titanic/sound/season_noises.cpp b/engines/titanic/sound/season_noises.cpp
index ce045488ee..14689d5337 100644
--- a/engines/titanic/sound/season_noises.cpp
+++ b/engines/titanic/sound/season_noises.cpp
@@ -89,7 +89,7 @@ bool CSeasonNoises::ActMsg(CActMsg *msg) {
 	default:
 		break;
 	}
-	
+
 	CSignalObject signalMsg;
 	signalMsg._numValue = 2;
 	signalMsg.execute(this);
diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index 3288c4f4dd..a8c4849f2b 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -26,7 +26,7 @@
 
 namespace Titanic {
 
-CSound::CSound(CGameManager *owner, Audio::Mixer *mixer) : 
+CSound::CSound(CGameManager *owner, Audio::Mixer *mixer) :
 		_gameManager(owner), _soundManager(mixer) {
 	g_vm->_movieManager.setSoundManager(&_soundManager);
 }
diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp
index 1fb0c7341c..c1a46e5103 100644
--- a/engines/titanic/sound/sound_manager.cpp
+++ b/engines/titanic/sound/sound_manager.cpp
@@ -304,7 +304,7 @@ void QSoundManager::setPolarPosition(int handle, double range, double azimuth, d
 		Slot &slot = _slots[idx];
 		if (slot._handle == handle) {
 			qsWaveMixSetPanRate(slot._channel, QMIX_USEONCE, panRate);
-			qsWaveMixSetPolarPosition(slot._channel, QMIX_USEONCE, 
+			qsWaveMixSetPolarPosition(slot._channel, QMIX_USEONCE,
 				QSPOLAR(azimuth, range, elevation));
 			break;
 		}
@@ -452,7 +452,7 @@ void QSoundManager::updateVolume(int channel, uint panRate) {
 	default:
 		break;
 	}
-	
+
 	volume = (_musicPercent * volume) / 100;
 	qsWaveMixSetPanRate(channel, 0, panRate);
 	qsWaveMixSetVolume(channel, 0, (uint)volume);
diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h
index d1afdb4ad4..a3074a8e57 100644
--- a/engines/titanic/sound/sound_manager.h
+++ b/engines/titanic/sound/sound_manager.h
@@ -45,7 +45,7 @@ protected:
 public:
 	CSoundManager();
 	virtual ~CSoundManager() {}
-	
+
 	/**
 	 * Loads a sound
 	 * @param name		Name of sound resource
@@ -189,7 +189,7 @@ public:
 	 * Called after saving is complete
 	 */
 	virtual void postSave() {}
-	
+
 	/**
 	 * Sets the position and orientation for the listener (player)
 	 */
diff --git a/engines/titanic/sound/view_toggles_other_music.cpp b/engines/titanic/sound/view_toggles_other_music.cpp
index 731f59bd53..ffca1caea7 100644
--- a/engines/titanic/sound/view_toggles_other_music.cpp
+++ b/engines/titanic/sound/view_toggles_other_music.cpp
@@ -28,7 +28,7 @@ BEGIN_MESSAGE_MAP(CViewTogglesOtherMusic, CEnterViewTogglesOtherMusic)
 	ON_MESSAGE(LeaveViewMsg)
 END_MESSAGE_MAP()
 
-CViewTogglesOtherMusic::CViewTogglesOtherMusic() : 
+CViewTogglesOtherMusic::CViewTogglesOtherMusic() :
 		CEnterViewTogglesOtherMusic(), _value(1) {
 }
 
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index 7ba160cd37..01318db774 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -58,7 +58,7 @@ void CStarControl::save(SimpleFile *file, int indent) {
 
 void CStarControl::load(SimpleFile *file) {
 	int val = file->readNumber();
-	
+
 	if (!val) {
 		_starField.load(file);
 		if (!_starField.initDocument())
@@ -74,7 +74,7 @@ void CStarControl::load(SimpleFile *file) {
 
 		_fieldBC = 1;
 	}
-	
+
 	CGameObject::load(file);
 }
 
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index 5840495d34..e8d49992bb 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -29,7 +29,7 @@ namespace Titanic {
 FMatrix *CStarControlSub12::_matrix1;
 FMatrix *CStarControlSub12::_matrix2;
 
-CStarControlSub12::CStarControlSub12(void *val1, const CStar20Data *data) : 
+CStarControlSub12::CStarControlSub12(void *val1, const CStar20Data *data) :
 		_currentIndex(-1), _handlerP(nullptr), _field108(0),
 		_sub13(val1) {
 	setupHandler(data);
@@ -56,7 +56,7 @@ CStarControlSub12::~CStarControlSub12() {
 }
 
 void CStarControlSub12::proc2(const void *src) {
-	_sub13.copyFrom(src); 
+	_sub13.copyFrom(src);
 }
 
 void CStarControlSub12::proc3(const CStar20Data *src) {
diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index cc9e239194..490e6d0630 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -91,12 +91,12 @@ void CStarControlSub13::load(SimpleFile *file, int param) {
 	_field14 = file->readFloat();
 	_field18 = file->readFloat();
 	_field1C = file->readFloat();
-	
+
 	int widthHeight = file->readNumber();
 	_width = widthHeight & 0xff;
 	_height = _width >> 16;
 	_field24 = file->readNumber();
-	
+
 	for (int idx = 0; idx < 5; ++idx)
 		_valArray[idx] = file->readFloat();
 
diff --git a/engines/titanic/star_control/star_control_sub20.cpp b/engines/titanic/star_control/star_control_sub20.cpp
index 5c6c243eaa..cc1029896a 100644
--- a/engines/titanic/star_control/star_control_sub20.cpp
+++ b/engines/titanic/star_control/star_control_sub20.cpp
@@ -43,7 +43,7 @@ CStarControlSub20::CStarControlSub20(const CStar20Data *src) {
 	}
 }
 
-CStarControlSub20::~CStarControlSub20() { 
+CStarControlSub20::~CStarControlSub20() {
 	clear();
 }
 
diff --git a/engines/titanic/star_control/star_control_sub25.h b/engines/titanic/star_control/star_control_sub25.h
index e943782e37..b61569c49d 100644
--- a/engines/titanic/star_control/star_control_sub25.h
+++ b/engines/titanic/star_control/star_control_sub25.h
@@ -35,7 +35,7 @@ public:
 	CStarControlSub26 _sub1;
 	CStarControlSub26 _sub2;
 public:
-	
+
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index c50e8466ec..0dbc5fd700 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -69,7 +69,7 @@ void CStarField::render(CVideoSurface *surface, CStarControlSub12 *sub12) {
 	// TODO
 }
 
-int CStarField::get1() const { 
+int CStarField::get1() const {
 	return _val1;
 }
 
@@ -102,7 +102,7 @@ void CStarField::set3(int val) {
 }
 
 void CStarField::toggle4() {
-	_val4 = !_val4; 
+	_val4 = !_val4;
 }
 
 bool CStarField::set4(bool val) {
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index ef1ee29737..91cefbb457 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -73,12 +73,12 @@ public:
 	void set54(int val);
 	int get3() const;
 	void set3(int val);
-	void toggle4();	
+	void toggle4();
 	bool set4(bool val);
 	int get88() const;
 	int get5() const;
 	void update6();
-	int get6() const;	
+	int get6() const;
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index f5d1d36c49..437c0f0e52 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -29,7 +29,7 @@
 namespace Titanic {
 
 CStarView::CStarView() : _sub12(nullptr, nullptr), _sub13((void *)nullptr),
-		_owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0), 
+		_owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0),
 		_videoSurface2(nullptr), _field210(0), _homePhotoMask(nullptr),
 		_field218(0), _field21C(0) {
 	CStar20Data data = { 0, 0, 0x47C35000, 0, 0x41A00000,
@@ -53,7 +53,7 @@ void CStarView::load(SimpleFile *file, int param) {
 
 void CStarView::save(SimpleFile *file, int indent) {
 	_sub12.save(file, indent);
-	
+
 	file->writeNumberLine(_field118, indent);
 	if (_field118)
 		_sub13.save(file, indent);
diff --git a/engines/titanic/star_control/surface_fader_base.cpp b/engines/titanic/star_control/surface_fader_base.cpp
index dfd7c4ab1d..fb17fb1f31 100644
--- a/engines/titanic/star_control/surface_fader_base.cpp
+++ b/engines/titanic/star_control/surface_fader_base.cpp
@@ -70,7 +70,7 @@ CVideoSurface *CSurfaceFaderBase::fade(CScreenManager *screenManager, CVideoSurf
 
 	srcSurface->unlock();
 	_videoSurface->unlock();
-	
+
 	++_index;
 	return _videoSurface;
 }
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 45c3ce94b3..9e465c705f 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -94,19 +94,19 @@ bool AVISurface::play(int startFrame, int endFrame, int initialFrame, uint flags
 		me->_endFrame = endFrame;
 		me->_initialFrame = 0;
 		me->_gameObject = obj;
-		
+
 		info->addEvent(me);
 	}
 
 	_movieRangeInfo.push_back(info);
-	
+
 	if (_movieRangeInfo.size() == 1) {
 		// First play call, so start the movie playing
 		setReversed(info->_isReversed);
 		return startAtFrame(initialFrame);
 	} else {
 		return true;
-	}	
+	}
 }
 
 void AVISurface::stop() {
@@ -181,7 +181,7 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 			setReversed(info->_isReversed);
 			seekToFrame(newFrame);
 		}
-	
+
 		// Get any events for the given position
 		info->getMovieFrame(events, newFrame);
 		return renderFrame();
@@ -221,7 +221,7 @@ void AVISurface::setupDecompressor() {
 			_decoder->getVideoTrack(idx).getPixelFormat());
 
 		bool flag = false;
-		if (idx == 0 && _videoSurface && 
+		if (idx == 0 && _videoSurface &&
 				_videoSurface->getPitch() == _movieFrameSurface[idx]->pitch) {
 			const uint bitCount = _decoder->getVideoTrack(0).getBitCount();
 			const int vDepth = _videoSurface->getPixelDepth();
@@ -300,7 +300,7 @@ bool AVISurface::renderFrame() {
 			// Blit the frame directly to the video surface
 			assert(_streamCount == 1);
 			_videoSurface->blitFrom(Point(0, 0), &_movieFrameSurface[0]->rawSurface());
-			
+
 			_videoSurface->unlock();
 		}
 	} else {
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index 0bb14ceb27..b6231a646f 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -44,12 +44,12 @@ public:
 		Video::AVIDecoder(soundType) {}
 	AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) :
 		Video::AVIDecoder(frameRateOverride, soundType) {}
-	
+
 	/**
 	 * Returns the number of video tracks the decoder has
 	 */
 	uint videoTrackCount() const { return _videoTracks.size(); }
-	
+
 	/**
 	 * Returns the specified video track
 	 */
diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp
index 009c3f4944..da6de6278e 100644
--- a/engines/titanic/support/credit_text.cpp
+++ b/engines/titanic/support/credit_text.cpp
@@ -67,7 +67,7 @@ void CCreditText::setup() {
 
 		// Create a new group and line within it
 		CCreditLineGroup *group = new CCreditLineGroup();
-		CCreditLine *line = new CCreditLine(srcLine, 
+		CCreditLine *line = new CCreditLine(srcLine,
 			_screenManagerP->stringWidth(srcLine));
 		group->_lines.push_back(line);
 
@@ -125,7 +125,7 @@ void CCreditText::handleDots(CCreditLineGroup *group) {
 	// Figure out the maximum width of secondary lines
 	for (CCreditLines::iterator i = second; i != group->_lines.end(); ++i)
 		maxWidth = MAX(maxWidth, (*i)->_lineWidth);
-	
+
 	int charWidth = _screenManagerP->stringWidth(".");
 
 	// Process the secondary lines
diff --git a/engines/titanic/support/direct_draw.h b/engines/titanic/support/direct_draw.h
index a7e9cc8d93..08ead6d798 100644
--- a/engines/titanic/support/direct_draw.h
+++ b/engines/titanic/support/direct_draw.h
@@ -70,7 +70,7 @@ public:
 	 * @param width				Screen width
 	 * @param height			Screen height
 	 * @param bpp				Bits per pixel
-	 * @param numBackSurfaces	Number of back surfaces	
+	 * @param numBackSurfaces	Number of back surfaces
 	 */
 	void initVideo(int width, int height, int bpp, int numBackSurfaces);
 
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index 22bff275d2..2882b8da85 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -75,7 +75,7 @@ bool CFilesManager::scanForFile(const CString &name) {
 
 	CString filename = name;
 	filename.toLowercase();
-	
+
 	if (filename[0] == 'y' || filename[0] == 'z')
 		return true;
 	else if (filename[0] < 'a' || filename[0] > 'c')
diff --git a/engines/titanic/support/files_manager.h b/engines/titanic/support/files_manager.h
index a980ef1b25..45b067e86e 100644
--- a/engines/titanic/support/files_manager.h
+++ b/engines/titanic/support/files_manager.h
@@ -39,7 +39,7 @@ class CFilesManager {
 	struct ResourceEntry {
 		uint _offset;
 		uint _size;
-		
+
 		ResourceEntry() : _offset(0), _size(0) {}
 		ResourceEntry(uint offset, uint size) : _offset(offset), _size(size) {}
 	};
diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index 45d593755e..625d03720b 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -80,7 +80,7 @@ int STFont::getTextBounds(const CString &str, int maxWidth, Point *sizeOut) cons
 	if (_fontHeight == 0 || !_dataPtr)
 		// No font, so return immediately
 		return 0;
-	
+
 	// Loop through the characters of the string
 	if (!str.empty()) {
 		for (const char *strP = str.c_str(); *strP; ++strP) {
@@ -331,7 +331,7 @@ void STFont::checkLineWrap(Point &textSize, int maxWidth, const char *&str) cons
 			flag = true;
 		}
 	}
-	
+
 	if ((textSize.x + totalWidth) >= maxWidth && totalWidth < maxWidth) {
 		// Word wrap
 		textSize.x = 0;
diff --git a/engines/titanic/support/font.h b/engines/titanic/support/font.h
index 6c4fe8e9c3..685ab8ad73 100644
--- a/engines/titanic/support/font.h
+++ b/engines/titanic/support/font.h
@@ -50,13 +50,13 @@ private:
 	 * Copys a rectangle representing a character in the font data to
 	 * a given destination position in the surface
 	 */
-	void copyRect(CVideoSurface *surface, const Common::Point &destPos, 
+	void copyRect(CVideoSurface *surface, const Common::Point &destPos,
 		Rect &srcRect);
 
 	/**
 	 * Write a character
 	 */
-	WriteCharacterResult writeChar(CVideoSurface *surface, unsigned char c, 
+	WriteCharacterResult writeChar(CVideoSurface *surface, unsigned char c,
 		const Common::Point &pt, const Rect &destRect, const Rect *srcRect);
 
 	/**
diff --git a/engines/titanic/support/image_decoders.cpp b/engines/titanic/support/image_decoders.cpp
index 495d1d0982..2dba66fbb3 100644
--- a/engines/titanic/support/image_decoders.cpp
+++ b/engines/titanic/support/image_decoders.cpp
@@ -32,9 +32,9 @@ void CJPEGDecode::decode(OSVideoSurface &surface, const CString &name) {
 	// Use the ScucmmVM deoder to decode it
 	loadStream(*file.readStream());
 	const Graphics::Surface *srcSurf = getSurface();
-	
+
 	// Resize the surface if necessary
-	if (!surface.hasSurface() || surface.getWidth() != srcSurf->w 
+	if (!surface.hasSurface() || surface.getWidth() != srcSurf->w
 			|| surface.getHeight() != srcSurf->h)
 		surface.recreate(srcSurf->w, srcSurf->h);
 
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp
index 665ead3056..4dd1ab4366 100644
--- a/engines/titanic/support/mouse_cursor.cpp
+++ b/engines/titanic/support/mouse_cursor.cpp
@@ -53,7 +53,7 @@ CMouseCursor::CursorEntry::~CursorEntry() {
 	delete _transSurface;
 }
 
-CMouseCursor::CMouseCursor(CScreenManager *screenManager) : 
+CMouseCursor::CMouseCursor(CScreenManager *screenManager) :
 		_screenManager(screenManager), _cursorId(CURSOR_HOURGLASS),
 		_setCursorCount(0), _fieldE4(0), _fieldE8(0) {
 	loadCursorImages();
@@ -79,7 +79,7 @@ void CMouseCursor::loadCursorImages() {
 		// Open the cursors video and move to the given frame
 		OSMovie movie(key, surface);
 		movie.setFrame(idx);
-		
+
 		Graphics::ManagedSurface *transSurface = movie.duplicateTransparency();
 		_cursors[idx]._transSurface = transSurface;
 		surface->setTransparencySurface(transSurface);
@@ -147,7 +147,7 @@ void CMouseCursor::unlockE4() {
 
 void CMouseCursor::setPosition(const Point &pt, double rate) {
 	assert(rate >= 0.0 && rate <= 1.0);
-	
+
 	// TODO: Figure out use of the rate parameter
 	g_system->warpMouse(pt.x, pt.y);
 }
diff --git a/engines/titanic/support/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h
index 5bf6895a67..08de28e29d 100644
--- a/engines/titanic/support/mouse_cursor.h
+++ b/engines/titanic/support/mouse_cursor.h
@@ -86,12 +86,12 @@ public:
 	 * Hide the mouse cursor
 	 */
 	void hide();
-	
+
 	/**
 	 * Set the cursor
 	 */
 	void setCursor(CursorId cursorId);
-	
+
 	/**
 	 * Updates the mouse cursor
 	 */
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index eff0e0c754..aea51e1a1e 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -125,7 +125,7 @@ void OSMovie::play(uint startFrame, uint endFrame, uint initialFrame, uint flags
 void OSMovie::playCutscene(const Rect &drawRect, uint startFrame, uint endFrame) {
 	if (!_movieSurface)
 		_movieSurface = CScreenManager::_screenManagerPtr->createSurface(600, 340);
-	
+
 	bool widthLess = _videoSurface->getWidth() < 600;
 	bool heightLess = _videoSurface->getHeight() < 340;
 	Rect r(drawRect.left, drawRect.top,
diff --git a/engines/titanic/support/movie.h b/engines/titanic/support/movie.h
index be34244d96..acc647065f 100644
--- a/engines/titanic/support/movie.h
+++ b/engines/titanic/support/movie.h
@@ -72,7 +72,7 @@ public:
 	 * Starts playing the movie
 	 */
 	virtual void play(uint flags, CGameObject *obj) = 0;
-	
+
 	/**
 	 * Starts playing the movie
 	 */
@@ -82,13 +82,13 @@ public:
 	 * Starts playing the movie
 	 */
 	virtual void play(uint startFrame, uint endFrame, uint initialFrame, uint flags, CGameObject *obj) = 0;
-	
+
 	/**
 	 * Plays a sub-section of a movie, and doesn't return until either
 	 * the playback ends or a key has been pressed
 	 */
 	virtual void playCutscene(const Rect &drawRect, uint startFrame, uint endFrame) = 0;
-	
+
 	/**
 	 * Stops the movie
 	 */
@@ -103,12 +103,12 @@ public:
 	 * Set the current frame number
 	 */
 	virtual void setFrame(uint frameNumber) = 0;
-	
+
 	/**
 	 * Handle any pending movie events
 	 */
 	virtual bool handleEvents(CMovieEventList &events) = 0;
-	
+
 	/**
 	 * Return any movie range info associated with the movie
 	 */
@@ -171,17 +171,17 @@ public:
 	 * Starts playing the movie
 	 */
 	virtual void play(uint flags, CGameObject *obj);
-	
+
 	/**
 	 * Starts playing the movie
 	 */
 	virtual void play(uint startFrame, uint endFrame, uint flags, CGameObject *obj);
-	
+
 	/**
 	 * Starts playing the movie
 	 */
 	virtual void play(uint startFrame, uint endFrame, uint initialFrame, uint flags, CGameObject *obj);
-	
+
 	/**
 	 * Plays a sub-section of a movie, and doesn't return until either
 	 * the playback ends or a key has been pressed
@@ -192,7 +192,7 @@ public:
 	 * Stops the movie
 	 */
 	virtual void stop();
-	
+
 	/**
 	 * Add a playback event
 	 */
@@ -202,7 +202,7 @@ public:
 	 * Set the current frame number
 	 */
 	virtual void setFrame(uint frameNumber);
-	
+
 	/**
 	 * Handle any pending movie events
 	 */
diff --git a/engines/titanic/support/movie_clip.h b/engines/titanic/support/movie_clip.h
index 513ed4a339..17c91b190c 100644
--- a/engines/titanic/support/movie_clip.h
+++ b/engines/titanic/support/movie_clip.h
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-enum ClipFlag { 
+enum ClipFlag {
 	CLIPFLAG_HAS_END_FRAME = 1,
 	CLIPFLAG_4 = 4,
 	CLIPFLAG_HAS_START_FRAME = 8,
diff --git a/engines/titanic/support/movie_range_info.cpp b/engines/titanic/support/movie_range_info.cpp
index d4d9fc0e2a..018ffd63b5 100644
--- a/engines/titanic/support/movie_range_info.cpp
+++ b/engines/titanic/support/movie_range_info.cpp
@@ -91,7 +91,7 @@ void CMovieRangeInfo::process(CGameObject *owner) {
 		flags |= MOVIE_REPEAT;
 	if (_startFrame)
 		flags |= MOVIE_REVERSE;
-	
+
 	for (CMovieEventList::iterator i = _events.begin(); i != _events.end(); ++i) {
 		CMovieEvent *movieEvent = *i;
 		if (movieEvent->_type == MET_MOVIE_END) {
diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp
index bcf43fc8cb..2e9bbcb6de 100644
--- a/engines/titanic/support/screen_manager.cpp
+++ b/engines/titanic/support/screen_manager.cpp
@@ -178,7 +178,7 @@ void OSScreenManager::blitFrom(SurfaceNum surfaceNum, CVideoSurface *src,
 		destSurface = _backSurfaces[surfaceNum]._surface;
 	if (!destSurface->hasSurface())
 		return;
-	
+
 	Point destPoint = destPos ? *destPos : Point(0, 0);
 	Rect srcBounds = srcRect ? *srcRect : Rect(0, 0, src->getWidth(), src->getHeight());
 	Rect *bounds = &srcBounds;
@@ -220,7 +220,7 @@ void OSScreenManager::blitFrom(SurfaceNum surfaceNum, const Rect *rect, CVideoSu
 		destSurface->blitFrom(Point(rect->left, rect->top), src, rect);
 }
 
-int OSScreenManager::writeString(int surfaceNum, const Rect &destRect, 
+int OSScreenManager::writeString(int surfaceNum, const Rect &destRect,
 		int yOffset, const CString &str, CTextCursor *textCursor) {
 	CVideoSurface *surface;
 	Rect bounds;
diff --git a/engines/titanic/support/screen_manager.h b/engines/titanic/support/screen_manager.h
index cad6901b02..f88928af8b 100644
--- a/engines/titanic/support/screen_manager.h
+++ b/engines/titanic/support/screen_manager.h
@@ -78,7 +78,7 @@ public:
 
 	virtual void setWindowHandle(int v);
 	virtual bool resetWindowHandle(int v);
-	
+
 	/**
 	 * Sets the video mode
 	 */
@@ -88,17 +88,17 @@ public:
 	 * Handles drawing the cursors
 	 */
 	virtual void drawCursors() = 0;
-	
+
 	/**
 	 * Locks a specified surface number for access and returns a pointer to it
 	 */
 	virtual CVideoSurface *lockSurface(SurfaceNum surfaceNum) = 0;
-	
+
 	/**
 	 * Unlocks a previously locked surface
 	 */
 	virtual void unlockSurface(CVideoSurface *surface) = 0;
-	
+
 	/**
 	 * Gets a specified surface number
 	 */
@@ -108,7 +108,7 @@ public:
 	 * Return the front render surface
 	 */
 	virtual CVideoSurface *getFrontRenderSurface() const = 0;
-	
+
 	/**
 	 * Fill an area with a specific color
 	 */
@@ -191,7 +191,7 @@ public:
 	 * Creates a surface of a given size
 	 */
 	virtual CVideoSurface *createSurface(int w, int h) = 0;
-	
+
 	/**
 	 * Creates a surface from a specified resource
 	 */
@@ -213,7 +213,7 @@ public:
 	 * Show the mouse cursor
 	 */
 	virtual void showCursor() = 0;
-	
+
 	/**
 	 * Hide the mouse cursor
 	 */
@@ -272,12 +272,12 @@ public:
 	 * Locks a specified surface number for access and returns a pointer to it
 	 */
 	virtual CVideoSurface *lockSurface(SurfaceNum surfaceNum);
-	
+
 	/**
 	 * Unlocks a previously locked surface
 	 */
 	virtual void unlockSurface(CVideoSurface *surface);
-	
+
 	/**
 	 * Gets a specified surface number
 	 */
@@ -373,7 +373,7 @@ public:
 	 * Creates a surface of a given size
 	 */
 	virtual CVideoSurface *createSurface(int w, int h);
-	
+
 	/**
 	 * Creates a surface from a specified resource
 	 */
@@ -383,7 +383,7 @@ public:
 	 * Show the mouse cursor
 	 */
 	virtual void showCursor();
-	
+
 	/**
 	 * Hide the mouse cursor
 	 */
diff --git a/engines/titanic/support/simple_file.cpp b/engines/titanic/support/simple_file.cpp
index 35b2e28e4a..7e3cea35be 100644
--- a/engines/titanic/support/simple_file.cpp
+++ b/engines/titanic/support/simple_file.cpp
@@ -52,7 +52,7 @@ SimpleFile::~SimpleFile() {
 }
 
 void SimpleFile::open(Common::SeekableReadStream *stream) {
-	close();	
+	close();
 	_inStream = stream;
 }
 
@@ -290,7 +290,7 @@ void SimpleFile::writeString(const CString &str) const {
 
 	const char *msgP = str.c_str();
 	char c;
-	
+
 	while ((c = *msgP++) != '\0') {
 		switch (c) {
 		case '\r':
@@ -422,8 +422,8 @@ bool SimpleFile::scanf(const char *format, ...) {
 	while (!formatStr.empty()) {
 		if (formatStr.hasPrefix(" ")) {
 			formatStr.deleteChar(0);
-			
-			safeRead(&c, 1);			
+
+			safeRead(&c, 1);
 			if (!Common::isSpace(c))
 				return false;
 
@@ -434,7 +434,7 @@ bool SimpleFile::scanf(const char *format, ...) {
 			formatStr = CString(formatStr.c_str() + 2);
 			int *param = (int *)va_arg(va, int *);
 			*param = readNumber();
-			
+
 			if (!eos())
 				_inStream->seek(-1, SEEK_CUR);
 		} else if (formatStr.hasPrefix("%s")) {
@@ -488,7 +488,7 @@ bool StdCWadFile::open(const Common::String &filename) {
 	CString resStr = name.mid(idx + 1, extPos - idx - 1);
 	int resIndex = resStr.readInt();
 
-	// Open up the index for access 
+	// Open up the index for access
 	f.open(fname);
 	int indexSize = f.readUint32LE() / 4;
 	assert(resIndex < indexSize);
diff --git a/engines/titanic/support/string.cpp b/engines/titanic/support/string.cpp
index 9961cfce59..cf1b29b6ec 100644
--- a/engines/titanic/support/string.cpp
+++ b/engines/titanic/support/string.cpp
@@ -41,7 +41,7 @@ CString CString::left(uint count) const {
 
 CString CString::right(uint count) const {
 	uint strSize = size();
-	return (count > strSize) ? CString() : 
+	return (count > strSize) ? CString() :
 		CString(c_str() + strSize - count, c_str() + strSize);
 }
 
@@ -85,7 +85,7 @@ FileType CString::fileTypeSuffix() const {
 		return FILETYPE_WAV;
 	else if (ext == "2" || ext == "3")
 		return FILETYPE_MOVIE;
-	
+
 	ext = right(3);
 	if (ext == "tga" || ext == "jpg")
 		return FILETYPE_IMAGE;
diff --git a/engines/titanic/support/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp
index ad3fe4ed26..5c7593ba68 100644
--- a/engines/titanic/support/text_cursor.cpp
+++ b/engines/titanic/support/text_cursor.cpp
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-CTextCursor::CTextCursor(CScreenManager *screenManager) : 
+CTextCursor::CTextCursor(CScreenManager *screenManager) :
 		_screenManager(screenManager), _active(false), _blinkVisible(false),
 		_backRenderSurface(nullptr), _frontRenderSurface(nullptr),
 		_blinkDelay(300), _size(2, 10), _priorBlinkTime(0),
@@ -70,7 +70,7 @@ void CTextCursor::draw() {
 	if (_blinkVisible) {
 		Rect cursorRect = getCursorBounds();
 		_surface->blitFrom(Common::Point(0, 0), _backRenderSurface, &cursorRect);
-	
+
 		if (!_screenBounds.isEmpty())
 			// Limit the cursor rect to only within designated screen area
 			cursorRect.constrain(_screenBounds);
@@ -80,7 +80,7 @@ void CTextCursor::draw() {
 			_backRenderSurface->_ddSurface->fillRect(&cursorRect,
 				_cursorR, _cursorG, _cursorB);
 		}
-	
+
 		//_screenManager->blitFrom(SURFACE_BACKBUFFER, _surface, &_pos);
 	}
 }
diff --git a/engines/titanic/support/time_event_info.cpp b/engines/titanic/support/time_event_info.cpp
index 0226223f1a..e088a8e0c2 100644
--- a/engines/titanic/support/time_event_info.cpp
+++ b/engines/titanic/support/time_event_info.cpp
@@ -90,7 +90,7 @@ void CTimeEventInfoList::setPersisent(uint id, bool flag) {
 
 uint CTimeEventInfo::_nextId;
 
-CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0), 
+CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0),
 		_repeated(false), _firstDuration(0), _repeatDuration(0),
 		_target(nullptr), _actionVal(0), _timerCtr(0), _done(false),
 		_lastTimerTicks(0), _relativeTicks(0), _persisent(true) {
@@ -147,7 +147,7 @@ void CTimeEventInfo::load(SimpleFile *file) {
 void CTimeEventInfo::postLoad(uint ticks, CProjectItem *project) {
 	if (!_persisent || _targetName.empty())
 		_done = true;
-	
+
 	// Get the timer's target
 	if (project)
 		_target = project->findByName(_targetName);
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index c71f898889..45813bb740 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -35,7 +35,7 @@ byte CVideoSurface::_palette2[32][32];
 CVideoSurface::CVideoSurface(CScreenManager *screenManager) :
 		_screenManager(screenManager), _rawSurface(nullptr), _movie(nullptr),
 		_pendingLoad(false), _flipVertically(false), _fastBlitFlag(false),
-		_transparencySurface(nullptr), _transparencyMode(TRANS_DEFAULT), 
+		_transparencySurface(nullptr), _transparencyMode(TRANS_DEFAULT),
 		_freeTransparencySurface(DisposeAfterUse::NO), _hasFrame(true), _lockCount(0) {
 	_videoSurfaceNum = _videoSurfaceCounter++;
 }
@@ -256,7 +256,7 @@ void CVideoSurface::transBlitRect(const Rect &srcRect, const Rect &destRect, CVi
 				}
 
 				// Move to next line
-				srcPtr = flipFlag ? srcPtr + (src->getPitch() / 2) : 
+				srcPtr = flipFlag ? srcPtr + (src->getPitch() / 2) :
 					srcPtr - (src->getPitch() / 2);
 				destPtr -= destArea.pitch / 2;
 			}
@@ -330,7 +330,7 @@ OSVideoSurface::OSVideoSurface(CScreenManager *screenManager, const CResourceKey
 		CVideoSurface(screenManager) {
 	_ddSurface = nullptr;
 	_pendingLoad = pendingLoad;
-	
+
 	if (_pendingLoad) {
 		loadResource(key);
 	} else {
@@ -453,7 +453,7 @@ void OSVideoSurface::recreate(int width, int height) {
 }
 
 void OSVideoSurface::resize(int width, int height) {
-	if (!_ddSurface || _ddSurface->getWidth() != width || 
+	if (!_ddSurface || _ddSurface->getWidth() != width ||
 			_ddSurface->getHeight() != height)
 		recreate(width, height);
 }
@@ -467,7 +467,7 @@ int OSVideoSurface::getPixelDepth() {
 		error("Could not load resource");
 
 	lock();
-	
+
 	int result = _rawSurface->format.bytesPerPixel;
 	if (result == 1)
 		// Paletted 8-bit images don't store the color directly in the pixels
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp
index b327c3647e..76f28540ea 100644
--- a/engines/titanic/true_talk/barbot_script.cpp
+++ b/engines/titanic/true_talk/barbot_script.cpp
@@ -107,7 +107,7 @@ int BarbotScript::chooseResponse(const TTroomScript *roomScript, const TTsentenc
 
 		applyResponse();
 		return 2;
-	
+
 	} else if (tag == MKTAG('B', 'A', 'R', 'U') && getRandomNumber(100) > 50) {
 		selectResponse(250025);
 		switch (getDialsBitset()) {
@@ -120,7 +120,7 @@ int BarbotScript::chooseResponse(const TTroomScript *roomScript, const TTsentenc
 		}
 
 		applyResponse();
-		return 2;	
+		return 2;
 	}
 
 	if (tag == MKTAG('T', 'H', 'R', 'T') || tag == MKTAG('S', 'L', 'O', 'W') ||
@@ -165,7 +165,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
 			dialogueId = ARRAY2[_arrIndex++];
 		} else if (getRandomNumber(100) > 35) {
 			dialogueId = ARRAY2[0];
-			_arrIndex = 1;		
+			_arrIndex = 1;
 		} else if (getRandomNumber(100) > 60) {
 			switch (sentence->_field2C) {
 			case 2:
@@ -204,7 +204,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
 	CTrueTalkManager::setFlags(32, getValue(32) - 1);
 	CTrueTalkManager::setFlags(33, getValue(33) - 1);
 	CTrueTalkManager::setFlags(34, getValue(34) - 1);
-	
+
 	TTtreeResult treeResult;
 	int val34 = getState();
 	setState(0);
@@ -314,7 +314,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
 			return applySentenceIds(50382);
 		} else if (flag2) {
 			return applySentenceIds(51423);
-		} 
+		}
 		// Deliberate fall-through
 
 	case 16:
@@ -523,7 +523,7 @@ int BarbotScript::process(const TTroomScript *roomScript, const TTsentence *sent
 			CTrueTalkManager::triggerAction(30, 0);
 			return 2;
 		}
-		
+
 		return applySentenceIds(50320);
 	case 58:
 		if (val2C == 6 || val2C == 10)
@@ -935,7 +935,7 @@ int BarbotScript::handleQuote(const TTroomScript *roomScript, const TTsentence *
 		break;
 	case MKTAG('P', 'H', 'I', 'L'):
 	case MKTAG('R', 'C', 'K', 'T'):
-	case MKTAG('S', 'C', 'I', 'E'):		
+	case MKTAG('S', 'C', 'I', 'E'):
 		tagId = MKTAG('S', 'C', 'I', 'E');
 		break;
 	case MKTAG('T', 'R', 'A', '2'):
@@ -1011,7 +1011,7 @@ uint BarbotScript::getDialsBitset() const {
 		bits |= 2;
 	if (!getDialRegion(2))
 		bits |= 4;
-	
+
 	return bits;
 }
 
@@ -1098,7 +1098,7 @@ int BarbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScrip
 			}
 			break;
 		}
-			
+
 		case 10: {
 			uint val = CTrueTalkManager::getStateValue(3);
 			bool bit0 = (val & 1) != 0;
diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h
index 1820d77216..a8c92b2927 100644
--- a/engines/titanic/true_talk/barbot_script.h
+++ b/engines/titanic/true_talk/barbot_script.h
@@ -74,7 +74,7 @@ public:
 
 	virtual int handleQuote(const TTroomScript *roomScript, const TTsentence *sentence,
 		uint val, uint tagId, uint remainder);
-	
+
 	/**
 	 * Handles updating NPC state based on specified dialogue Ids and dial positions
 	 */
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index b773e8af30..038285ec8d 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -245,7 +245,7 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 					&& sentence->localWord("we") && sentence->localWord("in"))
 			|| (sentence->_field2C == 3 && sentence->localWord("rom")
 					&& sentence->localWord("is") && sentence->localWord("this"))
-			) { 
+			) {
 		uint id = getRangeValue(getRoomDialogueId(roomScript));
 		addResponse(getDialogueId(id ? id : 201384));
 		applyResponse();
@@ -258,7 +258,7 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 		result = processEntries(&_sentences[2], 0, roomScript, sentence);
 	} else if (getValue(1) == 1) {
 		result = processEntries(&_sentences[3], 0, roomScript, sentence);
-		
+
 		if (sentence->contains("shrinkbot")) {
 			addResponse(getDialogueId(200583));
 			applyResponse();
@@ -521,7 +521,7 @@ int BellbotScript::handleQuote(const TTroomScript *roomScript, const TTsentence
 	default:
 		break;
 	}
-	
+
 	return TTnpcScript::handleQuote(roomScript, sentence, val, tagId, remainder);
 }
 
@@ -835,7 +835,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 			applyFlag = true;
 		}
 		break;
-	
+
 	case 5:
 		if (sentence->_field2C == 11 || sentence->_field2C == 13) {
 			addResponse(getDialogueId(200492));
@@ -1497,7 +1497,7 @@ stateFlag = false;
 	case 84:
 		if (sentence->_field2C == 12) {
 			addResponse(getDialogueId(202119));
-			
+
 			switch (getValue(1)) {
 			case 1:
 				addResponse(getDialogueId(202024));
@@ -1631,7 +1631,7 @@ bool BellbotScript::randomResponse1(const TTroomScript *roomScript, uint id) {
 		randomResponse3(roomScript, id);
 		applyResponse();
 	}
-	
+
 	return false;
 }
 
@@ -1729,7 +1729,7 @@ bool BellbotScript::checkCommonWords(const TTroomScript *roomScript, const TTsen
 		addResponse(getDialogueId(200847));
 	} else if (sentence->localWord("canal")) {
 		addResponse(getDialogueId(getValue(1) == 1 ? 200846 : 200847));
-	} else if (sentence->localWord("firstclass") && 
+	} else if (sentence->localWord("firstclass") &&
 			(sentence->localWord("stateroom") || sentence->localWord("room"))) {
 		addResponse(getDialogueId(getValue(1) == 1 ? 200840 : 200306));
 	} else if (sentence->localWord("secondclass") && sentence->localWord("stateroom") && sentence->localWord("room")) {
@@ -1790,12 +1790,12 @@ bool BellbotScript::checkCommonWords(const TTroomScript *roomScript, const TTsen
 		} else {
 			addResponse(getDialogueId(200686));
 		}
-	} else if (sentence->localWord("embarklobby") 
+	} else if (sentence->localWord("embarklobby")
 			|| sentence->localWord("lobby")) {
 		addResponse(getDialogueId(200850));
 	} else if (sentence->localWord("pellerator")) {
 		addResponse(getDialogueId(200862));
-	} else if (sentence->localWord("servicelift") 
+	} else if (sentence->localWord("servicelift")
 			|| (sentence->localWord("service") && sentence->localWord("elevator"))) {
 		addResponse(getDialogueId(200855));
 	} else if (sentence->localWord("elevator")) {
diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h
index 6f57ee718f..7edb182301 100644
--- a/engines/titanic/true_talk/bellbot_script.h
+++ b/engines/titanic/true_talk/bellbot_script.h
@@ -78,7 +78,7 @@ private:
 	bool checkCommonWords(const TTroomScript *roomScript, const TTsentence *sentence);
 
 	uint getRoomDialogueId(const TTroomScript *roomScript);
-	
+
 	/**
 	 * Adds a description of the room to the conversation response
 	 */
diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index f3a997e218..4df47e0af1 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -276,7 +276,7 @@ int DeskbotScript::handleQuote(const TTroomScript *roomScript, const TTsentence
 	default:
 		break;
 	}
-	
+
 	return TTnpcScript::handleQuote(roomScript, sentence, val, tagId, remainder);
 
 }
@@ -324,7 +324,7 @@ int DeskbotScript::updateState(uint oldId, uint newId, int index) {
 		newId = getStateDialogueId();
 	if (newId == 240464 && getValue(1) != 1)
 		newId = 240462;
-	
+
 	if (newId == 241635 && isDial1Medium()) {
 		addResponse(getDialogueId(241556));
 		newId = getRangeValue(241632);
@@ -408,7 +408,7 @@ int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 	default:
 		break;
 	}
-	
+
 	return 0;
 }
 
@@ -480,7 +480,7 @@ uint DeskbotScript::addAssignedRoomDialogue2() {
 void DeskbotScript::addAssignedRoomDialogue3() {
 	addResponse(getDialogueId(241513));
 	addResponse(getDialogueId(241510));
-	
+
 	CTrueTalkManager::setFlags(1, 2);
 	setDialRegion(0, 0);
 	setDialRegion(1, 0);
@@ -618,7 +618,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 		if (isDial1Low() && getValue(1) == 4) {
 			if (sentence->_field2C == 12 || sentence->_field2C == 13
 					|| sentence->contains("do not")) {
-				
+
 				addResponse(getDialogueId(240447));
 				setDialRegion(0, 0);
 				setDialRegion(1, 0);
@@ -1148,7 +1148,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 			addResponse(getDialogueId(241267));
 			break;
 		}
-		
+
 		add241716();
 		applyFlag = true;
 		stateFlag = false;
@@ -1223,7 +1223,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 
 			addResponse(getDialogueId(241711));
 		}
-			
+
 		applyFlag = true;
 		stateFlag = false;
 		break;
@@ -1244,7 +1244,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 			}
 
 		}
-		
+
 		applyFlag = true;
 		stateFlag = false;
 		break;
@@ -1254,7 +1254,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 				|| sentence->contains("balcony") || sentence->contains("neither")
 				|| sentence->contains("the 1") || sentence->contains("the 2")
 				|| sentence->contains("former") || sentence->contains("latter")
-				|| sentence->contains("either")) { 
+				|| sentence->contains("either")) {
 			addResponse(getDialogueId(241700));
 			addResponse(getDialogueId(241687));
 		} else {
@@ -1299,7 +1299,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 				|| sentence->contains("princess") || sentence->contains("small")
 				|| sentence->contains("the 1") || sentence->contains("the 2")
 				|| sentence->contains("the 3") || sentence->contains("the 4")
-				|| sentence->contains("big") || sentence->contains("large")) { 
+				|| sentence->contains("big") || sentence->contains("large")) {
 			addResponse(getDialogueId(241700));
 			addResponse(getDialogueId(241739));
 		} else {
@@ -1317,7 +1317,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 		if (sentence->contains("constitutional") || sentence->contains("const")
 				|| sentence->contains("absolute") || sentence->contains("small")
 				|| sentence->contains("the 1") || sentence->contains("the 2")
-				|| sentence->contains("big") || sentence->contains("large")) { 
+				|| sentence->contains("big") || sentence->contains("large")) {
 			addResponse(getDialogueId(241700));
 			addResponse(getDialogueId(241739));
 		} else {
@@ -1334,7 +1334,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 	case 91:
 		if (sentence->contains("benev") || sentence->contains("dict")
 				|| sentence->contains("small") || sentence->contains("the 1")
-				|| sentence->contains("the 2") || sentence->contains("big") 
+				|| sentence->contains("the 2") || sentence->contains("big")
 				|| sentence->contains("large") || sentence->contains("former")
 				|| sentence->contains("latter")) {
 			addResponse(getDialogueId(241700));
@@ -1384,7 +1384,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 				|| sentence->contains("suite") || sentence->contains("next door")
 				|| sentence->contains("the 1") || sentence->contains("the 2")
 				|| sentence->contains("former") || sentence->contains("latter")
-				|| sentence->contains("same room")) { 
+				|| sentence->contains("same room")) {
 			addAssignedRoom();
 			setState(0);
 			CTrueTalkManager::setFlags(17, 0);
@@ -1424,7 +1424,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 			stateFlag = false;
 		}
 		break;
-	
+
 	default:
 		break;
 	}
diff --git a/engines/titanic/true_talk/dialogue_file.cpp b/engines/titanic/true_talk/dialogue_file.cpp
index cbd3685315..e5438c5825 100644
--- a/engines/titanic/true_talk/dialogue_file.cpp
+++ b/engines/titanic/true_talk/dialogue_file.cpp
@@ -34,7 +34,7 @@ void DialogueIndexEntry::load(Common::SeekableReadStream &s) {
 CDialogueFile::CDialogueFile(const CString &filename, uint count) {
 	if (!_file.open(filename))
 		error("Could not locate dialogue file - %s", filename.c_str());
-	
+
 	_cache.resize(count);
 
 	_file.readUint32LE();		// Skip over file Id
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index 1ca1ab13e5..5c7403f187 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -70,7 +70,7 @@ void DoorbotScript::setupSentences() {
 
 	_mappings.load("Mappings/Doorbot", 4);
 	_entries.load("Sentences/Doorbot");
-	
+
 	static const int SENTENCE_NUMS[11] = {
 		2, 100, 101, 102, 107, 110, 111, 124, 129, 131, 132
 	};
@@ -364,7 +364,7 @@ int DoorbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 
 		case 32:
 			return setResponse(10110, 0);
-			
+
 		case 33:
 			if (sentence->contains("sieve") || sentence->contains("colander")
 					|| sentence->contains("vegetable") || sentence->contains("ground")
@@ -497,7 +497,7 @@ int DoorbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 			return setResponse(getDialogueId(220000));
 		break;
 	}
-	
+
 	return 2;
 }
 
@@ -672,7 +672,7 @@ int DoorbotScript::updateState(uint oldId, uint newId, int index) {
 	bool flag39 = getValue(39) != 0;
 	CTrueTalkManager::setFlags(38, 0);
 	CTrueTalkManager::setFlags(39, 0);
-	
+
 	if (newId > 220890) {
 		switch (newId) {
 		case 221064:
@@ -897,7 +897,7 @@ int DoorbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 	case 29:
 		if (sentence->localWord("another") || sentence->localWord("more") ||
 				sentence->localWord("additional") || sentence->contains("another") ||
-				sentence->contains("more") || sentence->contains("additional")) { 
+				sentence->contains("more") || sentence->contains("additional")) {
 			addResponse(getDialogueId(220058));
 			applyResponse();
 			return 2;
diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp
index e0636d045f..e902169ed0 100644
--- a/engines/titanic/true_talk/maitred_script.cpp
+++ b/engines/titanic/true_talk/maitred_script.cpp
@@ -106,7 +106,7 @@ int MaitreDScript::process(const TTroomScript *roomScript, const TTsentence *sen
 			applyResponse();
 		}
 
-		return 2;		
+		return 2;
 	}
 
 	if (++_answerCtr > 50 || sentence->localWord("stop") || sentence->localWord("enough")
diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h
index ec7bec7629..530eed09fd 100644
--- a/engines/titanic/true_talk/parrot_script.h
+++ b/engines/titanic/true_talk/parrot_script.h
@@ -32,7 +32,7 @@ private:
 	/**
 	 * Setup sentence data
 	 */
-	void setupSentences(); 
+	void setupSentences();
 public:
 	ParrotScript(int val1, const char *charClass, int v2,
 		const char *charName, int v3, int val2, int v4, int v5, int v6, int v7);
diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp
index 2741e6b640..802e2b4ba6 100644
--- a/engines/titanic/true_talk/script_handler.cpp
+++ b/engines/titanic/true_talk/script_handler.cpp
@@ -78,7 +78,7 @@ int CScriptHandler::processInput(TTroomScript *roomScript, TTnpcScript *npcScrip
 		const TTstring &line) {
 	if (!roomScript || !line.isValid())
 		return SS_5;
-	
+
 	TTsentence *sentence = new TTsentence(_inputCtr++, line, this, roomScript, npcScript);
 	int result = _parser.preprocess(sentence);
 	roomScript->scriptPreprocess(sentence);
diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index 01aa2ef1c5..e28eeed1ac 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * Set the character and room
 	 */
-	ScriptChangedResult scriptChanged(TTroomScript *roomScript, 
+	ScriptChangedResult scriptChanged(TTroomScript *roomScript,
 		TTnpcScript *npcScript, uint dialogueId);
 
 	int processInput(TTroomScript *roomScript, TTnpcScript *npcScript,
diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp
index c24e275827..14560e2d9f 100644
--- a/engines/titanic/true_talk/script_support.cpp
+++ b/engines/titanic/true_talk/script_support.cpp
@@ -36,7 +36,7 @@ int TTnpcScriptResponse::size() const {
 
 /*------------------------------------------------------------------------*/
 
-TTscriptRange::TTscriptRange(uint id, const Common::Array<uint> &values, 
+TTscriptRange::TTscriptRange(uint id, const Common::Array<uint> &values,
 		bool isRandom, bool isSequential) :
 		_id(id), _nextP(nullptr) {
 	_mode = SF_NONE;
diff --git a/engines/titanic/true_talk/script_support.h b/engines/titanic/true_talk/script_support.h
index a41673bd5c..bdaec6e7c9 100644
--- a/engines/titanic/true_talk/script_support.h
+++ b/engines/titanic/true_talk/script_support.h
@@ -55,7 +55,7 @@ struct TTscriptRange {
 
 	TTscriptRange() : _id(0), _nextP(nullptr),
 		_priorIndex(0), _mode(SF_NONE) {}
-	TTscriptRange(uint id, const Common::Array<uint> &values, bool isRandom, 
+	TTscriptRange(uint id, const Common::Array<uint> &values, bool isRandom,
 		bool isSequential);
 };
 
diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h
index d5cea7e66f..782e3eeb04 100644
--- a/engines/titanic/true_talk/succubus_script.h
+++ b/engines/titanic/true_talk/succubus_script.h
@@ -34,7 +34,7 @@ private:
 	/**
 	 * Setup sentence data
 	 */
-	void setupSentences(); 
+	void setupSentences();
 
 	/**
 	 * Add a response and optionally set the state
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index be9ca667de..ed45ab26a0 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -45,7 +45,7 @@ CTrueTalkNPC *CTrueTalkManager::_currentNPC;
 
 /*------------------------------------------------------------------------*/
 
-CTrueTalkManager::CTrueTalkManager(CGameManager *owner) : 
+CTrueTalkManager::CTrueTalkManager(CGameManager *owner) :
 		_gameManager(owner), _scripts(&_titleEngine), _currentCharId(0),
 		_dialogueFile(nullptr), _dialogueId(0) {
 	_titleEngine.setup(3, 3);
@@ -209,7 +209,7 @@ void CTrueTalkManager::preLoad() {
 void CTrueTalkManager::removeCompleted() {
 	for (TTtalkerList::iterator i = _talkers.begin(); i != _talkers.end(); ) {
 		TTtalker *talker = *i;
-		
+
 		if (talker->_done) {
 			i = _talkers.erase(i);
 			delete talker;
@@ -222,7 +222,7 @@ void CTrueTalkManager::removeCompleted() {
 void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) {
 	TTnpcScript *npcScript = getNpcScript(npc);
 	TTroomScript *roomScript = getRoomScript();
-	
+
 	_titleEngine.reset();
 	uint charId = npcScript->charId();
 	loadAssets(npc, charId);
@@ -337,7 +337,7 @@ void CTrueTalkManager::processInput(CTrueTalkNPC *npc, CTextInputMsg *msg, CView
 		loadAssets(npc, npcScript->charId());
 		setDialogue(npc, roomScript, view);
 	}
-	
+
 	_currentNPC = nullptr;
 }
 
@@ -376,7 +376,7 @@ CString CTrueTalkManager::readDialogueString() {
 		size_t entrySize = textRes->size();
 		byte *tempBuffer = (entrySize < STRING_BUFFER_SIZE) ? buffer :
 			new byte[entrySize + 1];
-		
+
 		_dialogueFile->read(textRes, tempBuffer, entrySize);
 		buffer[entrySize] = '\0';
 
@@ -406,7 +406,7 @@ uint CTrueTalkManager::readDialogueSpeech() {
 	for (uint idx = 0; idx < _titleEngine._indexes.size(); ++idx) {
 		CWaveFile *waveFile = _gameManager->_sound.getTrueTalkSound(
 			_dialogueFile, _titleEngine._indexes[idx] - _dialogueId);
-		if (waveFile) {			
+		if (waveFile) {
 			_speechDuration += waveFile->getDuration();
 		}
 	}
diff --git a/engines/titanic/true_talk/tt_action.h b/engines/titanic/true_talk/tt_action.h
index 29e2bc4e4a..c6f49af16d 100644
--- a/engines/titanic/true_talk/tt_action.h
+++ b/engines/titanic/true_talk/tt_action.h
@@ -29,7 +29,7 @@ namespace Titanic {
 
 class TTaction : public TTmajorWord {
 private:
-	static bool _staticFlag; 
+	static bool _staticFlag;
 protected:
 	int _field30;
 public:
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index c614e14dae..3c52c9f13b 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -27,7 +27,7 @@
 
 namespace Titanic {
 
-TTconcept::TTconcept() : _string1(" "), _string2(" "), 
+TTconcept::TTconcept() : _string1(" "), _string2(" "),
 		_scriptP(nullptr), _wordP(nullptr) {
 	if (setStatus())
 		setScriptType(ST_UNKNOWN_SCRIPT);
@@ -51,7 +51,7 @@ TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) :
 
 TTconcept::TTconcept(TTword *word, ScriptType scriptType) :
 	_string1(" "), _string2(" "), _wordP(nullptr), _scriptP(nullptr) {
-	
+
 	if (!word || !setStatus() || word->getStatus()) {
 		_status = SS_5;
 	} else {
@@ -74,7 +74,7 @@ TTconcept::TTconcept(TTconcept &src) :
 		if (setStatus()) {
 			_status = SS_VALID;
 			_scriptP = src._scriptP;
-			
+
 			if (src._wordP) {
 				_status = initializeWordRef(src._wordP);
 				initialize(src);
@@ -177,7 +177,7 @@ void TTconcept::initialize(TTconcept &src) {
 
 	_field30 = src._field30;
 	_field34 = src._field34;
-	
+
 	if (src._flag) {
 		g_vm->_exeResources._owner->setParserConcept(this, &src);
 		src.setFlag(true);
@@ -225,7 +225,7 @@ int TTconcept::setOwner(TTconcept *src) {
 
 int TTconcept::setOwner(TTword *src, bool dontDup) {
 	TTword *word = dontDup ? src : src->copy();
-	
+
 	if (word) {
 		if (!_word2P) {
 			_word2P = word;
diff --git a/engines/titanic/true_talk/tt_concept.h b/engines/titanic/true_talk/tt_concept.h
index 88afb6f28b..430b3b6a8c 100644
--- a/engines/titanic/true_talk/tt_concept.h
+++ b/engines/titanic/true_talk/tt_concept.h
@@ -125,8 +125,8 @@ public:
 	/**
 	 * Returns true if the word is of the specified class
 	 */
-	bool isWordClass(WordClass wordClass) const { 
-		return _wordP && _wordP->isClass(wordClass); 
+	bool isWordClass(WordClass wordClass) const {
+		return _wordP && _wordP->isClass(wordClass);
 	}
 
 	void setFlag(bool val) { _flag = val; }
diff --git a/engines/titanic/true_talk/tt_node.cpp b/engines/titanic/true_talk/tt_node.cpp
index cbbb1dd756..fece3b8889 100644
--- a/engines/titanic/true_talk/tt_node.cpp
+++ b/engines/titanic/true_talk/tt_node.cpp
@@ -78,7 +78,7 @@ TTnode *TTnode::getHead() {
 TTnode *TTnode::getTail() {
 	if (_nextP == nullptr)
 		return this;
-	
+
 	TTnode *node = _nextP;
 	while (node->_nextP)
 		node = node->_nextP;
diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h
index b9afdfad8a..bdca568b09 100644
--- a/engines/titanic/true_talk/tt_npc_script.h
+++ b/engines/titanic/true_talk/tt_npc_script.h
@@ -259,7 +259,7 @@ public:
 	 * and adds it to the response
 	 */
 	virtual void selectResponse(int id);
-	
+
 	/**
 	 * Handles scanning the word list for a given Id, and if
 	 * found adds it to the sentence concept list
@@ -275,7 +275,7 @@ public:
 	 * either a random value, or each value in turn
 	 */
 	virtual uint getRangeValue(uint id);
-	
+
 	/**
 	 * Resets the prior used index for the specified range
 	 */
@@ -295,7 +295,7 @@ public:
 	 * Returns a bitset of the dials being off or not
 	 */
 	virtual uint getDialsBitset() const { return 0; }
-	
+
 	virtual const TTscriptMapping *getMapping(int index);
 	virtual int doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence);
 
@@ -303,7 +303,7 @@ public:
 	 * Handles any post-response NPC processing
 	 */
 	virtual void postResponse(int v1, const TTsentenceEntry *entry, const TTroomScript *roomScript, const TTsentence *sentence) {}
-	
+
 	virtual void save(SimpleFile *file);
 	virtual void load(SimpleFile *file);
 	virtual void saveBody(SimpleFile *file);
@@ -337,7 +337,7 @@ public:
 	 * Handles a randomzied response
 	 */
 	virtual bool randomResponse(uint index);
-	
+
 	virtual uint translateId(uint id) const;
 
 	void preLoad();
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 95a302d53c..d67f5235c4 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -147,16 +147,16 @@ int TTparser::normalize(TTsentence *sentence) {
 			case '!':
 				sentence->set38(3);
 				break;
-			
+
 			case '\'':
 				if (!normalizeContraction(srcLine, index, *destLine))
 					flag = true;
 				break;
-			
+
 			case '.':
 				sentence->set38(1);
 				break;
-			
+
 			case ':':
 				commandVal = isEmoticon(srcLine, index);
 				if (commandVal) {
@@ -166,7 +166,7 @@ int TTparser::normalize(TTsentence *sentence) {
 					flag = true;
 				}
 				break;
-			
+
 			case ';':
 				commandVal = isEmoticon(srcLine, index);
 				if (commandVal == 6) {
@@ -177,7 +177,7 @@ int TTparser::normalize(TTsentence *sentence) {
 					index += 2;
 				}
 				break;
-			
+
 			case '<':
 				++index;
 				commandVal = isEmoticon(srcLine, index);
@@ -315,7 +315,7 @@ bool TTparser::normalizeContraction(const TTstring &srcLine, int srcIndex, TTstr
 				destLine.deleteLastChar();
 				destLine.deleteLastChar();
 				destLine += "m";
-			} else if (srcLine.hasSuffix(" sha") || 
+			} else if (srcLine.hasSuffix(" sha") ||
 					(srcIndex == 4 && srcLine.hasSuffix("sha"))) {
 				// shan't -> shall not
 				destLine.deleteLastChar();
@@ -726,7 +726,7 @@ int TTparser::loadRequests(TTword *word) {
 int TTparser::considerRequests(TTword *word) {
 	if (!_nodesP || !word)
 		return 0;
-	
+
 	TTconcept *concept = nullptr;
 	int status = 0;
 	bool flag = false;
@@ -802,7 +802,7 @@ int TTparser::considerRequests(TTword *word) {
 				} else {
 					status = _sentenceConcept->createConcept(0, 2, word);
 				}
-					
+
 				if (!status && !_sentenceConcept->_concept4P && _sentenceConcept->_concept0P) {
 					TTconcept *oldConcept = _sentenceConcept->_concept2P;
 					flag = filterConcepts(5, 2);
@@ -814,14 +814,14 @@ int TTparser::considerRequests(TTword *word) {
 				}
 			}
 			break;
-			
+
 		case SEEK_OBJECT_OVERRIDE:
 			if ((word->_wordClass == WC_THING || word->_wordClass == WC_PRONOUN) &&
 					_sentence->fn2(2, TTstring("thePlayer"), _sentenceConcept) &&
 					!_sentenceConcept->_concept3P) {
 				_sentenceConcept->_concept3P = _sentenceConcept->_concept2P;
 				_sentenceConcept->_concept2P = nullptr;
-					
+
 				flag = filterConcepts(5, 2);
 				if (!flag) {
 					status = _sentenceConcept->createConcept(0, 2, word);
@@ -893,7 +893,7 @@ int TTparser::considerRequests(TTword *word) {
 			if (word->_id == 601) {
 				if (_conceptP->findByWordClass(WC_THING))
 					status = _conceptP->setOwner(word, false);
-					
+
 				flag = true;
 			}
 			break;
@@ -992,11 +992,11 @@ int TTparser::considerRequests(TTword *word) {
 					oldNode->_field1C = 2;
 					_sentenceConcept = oldNode->addSibling();
 					concept = nullptr;
-						
+
 					_sentenceConcept->_concept1P = oldNode->_concept1P;
 					_sentenceConcept->_concept5P = oldNode->_concept5P;
 					_sentenceConcept->_concept2P = oldNode->_concept2P;
-						
+
 					if (seekVal) {
 						seekVal = 0;
 
@@ -1107,7 +1107,7 @@ int TTparser::considerRequests(TTword *word) {
 					if (!_sentenceConcept->_concept0P) {
 						newPictP = new TTpicture(TTstring("?"), WC_THING, 0, 0, 0, 0, 0);
 						newConceptP = new TTconcept(newPictP);
-							
+
 						_sentenceConcept->_concept0P = newConceptP;
 						delete newPictP;
 						addNode(4);
@@ -1195,7 +1195,7 @@ int TTparser::considerRequests(TTword *word) {
 		case MKTAG('H', 'E', 'L', 'P'):
 			if (_sentence->_field2C == 1)
 				_sentence->_field2C = 18;
-			
+
 			flag = true;
 			break;
 
@@ -1273,7 +1273,7 @@ int TTparser::considerRequests(TTword *word) {
 			break;
 		}
 
-		TTparserNode *nextP = dynamic_cast<TTparserNode *>(nodeP->_nextP);		
+		TTparserNode *nextP = dynamic_cast<TTparserNode *>(nodeP->_nextP);
 		if (flag)
 			delete nodeP;
 		nodeP = nextP;
@@ -1288,7 +1288,7 @@ int TTparser::processRequests(TTword *word) {
 	switch (status) {
 	case 0:
 		status = considerRequests(word);
-		
+
 		// Iterate through the words
 		while (_currentWordP) {
 			considerRequests(_currentWordP);
@@ -1388,7 +1388,7 @@ int TTparser::checkForAction() {
 	if (_conceptP && _currentWordP) {
 		// Firstly we need to get the next word to process, and remove it from
 		// the list pointed to by _currentWordP
-		TTword *word = _currentWordP;	
+		TTword *word = _currentWordP;
 		if (word->_nextP) {
 			// Chain of words, so we need to find the last word of the chain,
 			// and set the last-but-one's _nextP to nullptr to detach the last one
@@ -1410,7 +1410,7 @@ int TTparser::checkForAction() {
 				word->_text == "done") {
 			TTstring doStr("do");
 			TTaction *action = new TTaction(doStr, WC_ACTION, 112, 0, _sentenceConcept->get18());
-			
+
 			if (!action->isValid()) {
 				status = SS_4;
 			} else {
diff --git a/engines/titanic/true_talk/tt_parser.h b/engines/titanic/true_talk/tt_parser.h
index 201de7eb0e..5fd997a985 100644
--- a/engines/titanic/true_talk/tt_parser.h
+++ b/engines/titanic/true_talk/tt_parser.h
@@ -90,7 +90,7 @@ private:
 	 * spaces and lowercasing everything
 	 */
 	int normalize(TTsentence *sentence);
-	
+
 	/**
 	 * Submethod called by normalize to handle expanding contacted word pairs
 	 * like can't, should've, and so on.
@@ -118,7 +118,7 @@ private:
 	 * @param startIndex	Starting index in the start to check
 	 * @param strings		List of strings to check for. Strings come in pairs, with the
 	 * first being the string to match, and the second the replacement
-	 * @returns				Index of the start of the following word			
+	 * @returns				Index of the start of the following word
 	 */
 	static int searchAndReplace(TTstring &line, int startIndex, const StringArray &strings);
 
diff --git a/engines/titanic/true_talk/tt_picture.h b/engines/titanic/true_talk/tt_picture.h
index 18cb88278f..988f2a7437 100644
--- a/engines/titanic/true_talk/tt_picture.h
+++ b/engines/titanic/true_talk/tt_picture.h
@@ -53,7 +53,7 @@ public:
 	 * Checks whether the word's tag is a known type
 	 */
 	virtual bool checkTag() const;
-	
+
 	/**
 	 * Compare the word's tag to a given tag value
 	 */
@@ -63,7 +63,7 @@ public:
 	 * Return the tag associated with the word
 	 */
 	virtual uint getTag() const;
-	
+
 	virtual bool proc9(int val) const;
 	virtual int proc10() const;
 
diff --git a/engines/titanic/true_talk/tt_pronoun.h b/engines/titanic/true_talk/tt_pronoun.h
index ccc077152c..f7d61780fa 100644
--- a/engines/titanic/true_talk/tt_pronoun.h
+++ b/engines/titanic/true_talk/tt_pronoun.h
@@ -29,7 +29,7 @@ namespace Titanic {
 
 class TTpronoun : public TTmajorWord {
 private:
-	static bool _staticFlag; 
+	static bool _staticFlag;
 protected:
 	int _field30;
 public:
@@ -48,7 +48,7 @@ public:
 	 */
 	virtual TTword *copy() const;
 
-	virtual bool comparePronounTo(int val) const { 
+	virtual bool comparePronounTo(int val) const {
 		return _field30 == val;
 	}
 
diff --git a/engines/titanic/true_talk/tt_quotes_tree.cpp b/engines/titanic/true_talk/tt_quotes_tree.cpp
index 1f073b83f2..16453a10ae 100644
--- a/engines/titanic/true_talk/tt_quotes_tree.cpp
+++ b/engines/titanic/true_talk/tt_quotes_tree.cpp
@@ -33,12 +33,12 @@ static uint TABLE_INDEXES[3] = { 922, 1015, 1018 };
 
 void TTquotesTree::load() {
 	Common::SeekableReadStream *r = g_vm->_filesManager->getResource("TEXT/TREE");
-	
+
 	for (int idx = 0; idx < QUOTES_TREE_COUNT; ++idx) {
 		TTquotesTreeEntry &rec = _entries[idx];
 		assert(r->pos() < r->size());
-		
-		rec._id = r->readUint32LE();		
+
+		rec._id = r->readUint32LE();
 		if (rec._id == 0) {
 			// Nothing needed
 		} else {
@@ -64,14 +64,14 @@ int TTquotesTree::search(const char *str, QuoteTreeNum treeNum,
 	const TTquotesTreeEntry *bTree = &_entries[TABLE_INDEXES[treeNum]];
 	if (!search1(&str, bTree, buffer, tagId) || !buffer->_treeItemP)
 		return -1;
-	
+
 	if (remainder) {
 		while (*str) {
 			if (*str >= 'a' && *str != 's')
 				*remainder += *str;
 		}
 	}
-	
+
 	return buffer->_treeItemP->_id & 0xffffff;
 }
 
@@ -83,7 +83,7 @@ bool TTquotesTree::search1(const char **str, const TTquotesTreeEntry *bTree,
 	const char *strP = *str;
 	bool flag = false;
 
-	for (uint mode = bTree->_id >> 24; mode != 0; 
+	for (uint mode = bTree->_id >> 24; mode != 0;
 			++bTree, mode = bTree->_id >> 24) {
 
 		switch (mode) {
@@ -91,11 +91,11 @@ bool TTquotesTree::search1(const char **str, const TTquotesTreeEntry *bTree,
 			if (compareWord(str, bTree->_string.c_str()))
 				flag = true;
 			break;
-		
+
 		case 2:
 			compareWord(str, bTree->_string.c_str());
 			break;
-		
+
 		case 5:
 			if (READ_LE_UINT32(bTree->_string.c_str()) == tagId)
 				flag = true;
diff --git a/engines/titanic/true_talk/tt_response.cpp b/engines/titanic/true_talk/tt_response.cpp
index f007f98f97..1c784ad320 100644
--- a/engines/titanic/true_talk/tt_response.cpp
+++ b/engines/titanic/true_talk/tt_response.cpp
@@ -32,7 +32,7 @@ TTresponse::TTresponse(int dialogueId, int val2) : _field0(val2), _text(" "),
 		_dialogueId(dialogueId), _nextP(nullptr), _linkP(nullptr) {
 }
 
-TTresponse::TTresponse(const TTresponse *src) : _field0(src->_field0), 
+TTresponse::TTresponse(const TTresponse *src) : _field0(src->_field0),
 		_text(src->_text), _dialogueId(src->_dialogueId), _nextP(src->_nextP),
 		_linkP(src->_linkP) {
 }
@@ -52,7 +52,7 @@ TTresponse::~TTresponse() {
 TTresponse *TTresponse::copyChain() const {
 	TTresponse *returnResponseP = new TTresponse(this);
 
-	for (TTresponse *srcP = _nextP, *destP = returnResponseP; 
+	for (TTresponse *srcP = _nextP, *destP = returnResponseP;
 			srcP; srcP = srcP->_nextP, destP = destP->_nextP) {
 		destP->_nextP = new TTresponse(*srcP);
 	}
diff --git a/engines/titanic/true_talk/tt_room_script.cpp b/engines/titanic/true_talk/tt_room_script.cpp
index a49a5a5bd1..9b7be0a976 100644
--- a/engines/titanic/true_talk/tt_room_script.cpp
+++ b/engines/titanic/true_talk/tt_room_script.cpp
@@ -49,7 +49,7 @@ void TTroomScript::proc9(int v) {
 ScriptChangedResult TTroomScript::scriptChanged(TTscriptBase *npcScript, int id) {
 	if (id == 1)
 		_field54 = 1;
-	
+
 	return SCR_1;
 }
 
diff --git a/engines/titanic/true_talk/tt_room_script.h b/engines/titanic/true_talk/tt_room_script.h
index 39a50ac30d..0f47830a12 100644
--- a/engines/titanic/true_talk/tt_room_script.h
+++ b/engines/titanic/true_talk/tt_room_script.h
@@ -49,12 +49,12 @@ public:
 
 	virtual bool proc8() const = 0;
 	virtual void proc9(int v) = 0;
-	
+
 	/**
 	 * Called when the script changes
 	 */
 	virtual ScriptChangedResult scriptChanged(TTscriptBase *npcScript, int id) = 0;
-	
+
 	virtual bool proc11() const = 0;
 };
 
diff --git a/engines/titanic/true_talk/tt_script_base.h b/engines/titanic/true_talk/tt_script_base.h
index 869b0beb64..30a296a444 100644
--- a/engines/titanic/true_talk/tt_script_base.h
+++ b/engines/titanic/true_talk/tt_script_base.h
@@ -60,7 +60,7 @@ protected:
 	 * Delete any responses set up for the script
 	 */
 	void deleteResponses();
-	
+
 	/**
 	 * Creates and appends a new response fragment to the script specified by
 	 * the given conversation Id
@@ -83,7 +83,7 @@ protected:
 	 * Set the script state
 	 */
 	void setState(int state) { _state = state; }
-	
+
 	/**
 	 * Get the current state
 	 */
diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp
index f8ea65a475..4c01fd1ead 100644
--- a/engines/titanic/true_talk/tt_scripts.cpp
+++ b/engines/titanic/true_talk/tt_scripts.cpp
@@ -32,7 +32,7 @@
 #include "titanic/true_talk/succubus_script.h"
 
 namespace Titanic {
-	
+
 TTnpcScript *TTnpcScriptList::findById(int charId) const {
 	for (TTnpcScriptList::const_iterator i = begin(); i != end(); ++i) {
 		const TTnpcScriptListItem *item = *i;
diff --git a/engines/titanic/true_talk/tt_string.h b/engines/titanic/true_talk/tt_string.h
index 5b12d93418..69a94f6bf6 100644
--- a/engines/titanic/true_talk/tt_string.h
+++ b/engines/titanic/true_talk/tt_string.h
@@ -39,7 +39,7 @@ struct TTstringData {
 };
 
 enum TTstringStatus {
-	SS_VALID = 0, SS_1 = 1, SS_2 = 2, SS_3 = 3, SS_4 = 4, 
+	SS_VALID = 0, SS_1 = 1, SS_2 = 2, SS_3 = 3, SS_4 = 4,
 	SS_5 = 5, SS_7 = 7, SS_8 = 8, SS_11 = 11, SS_13 = 13
 };
 
@@ -127,7 +127,7 @@ public:
 	 * Get a char * pointer to the string data
 	 */
 	const char *c_str() const { return _data->_string.c_str(); }
-	
+
 	/**
 	 * Automatic operator to convert to a const char *
 	 */
diff --git a/engines/titanic/true_talk/tt_synonym.cpp b/engines/titanic/true_talk/tt_synonym.cpp
index b476efefcb..bb78e734ca 100644
--- a/engines/titanic/true_talk/tt_synonym.cpp
+++ b/engines/titanic/true_talk/tt_synonym.cpp
@@ -24,7 +24,7 @@
 
 namespace Titanic {
 
-TTsynonym::TTsynonym() : TTstringNode(), _file(HANDLE_STDIN), 
+TTsynonym::TTsynonym() : TTstringNode(), _file(HANDLE_STDIN),
 		_mode(0), _field1C(0) {
 }
 
@@ -72,7 +72,7 @@ int TTsynonym::save(SimpleFile *file) {
 		}
 
 		file->writeFormat("%c", ' ');
-		
+
 		if (synP->_file) {
 			file->writeFormat("%2.0d", synP->_file);
 		} else {
diff --git a/engines/titanic/true_talk/tt_title_script.cpp b/engines/titanic/true_talk/tt_title_script.cpp
index 85b56d0e1e..2effb96cc7 100644
--- a/engines/titanic/true_talk/tt_title_script.cpp
+++ b/engines/titanic/true_talk/tt_title_script.cpp
@@ -25,7 +25,7 @@
 namespace Titanic {
 
 TTTitleScript::TTTitleScript() : TTscriptBase(1, "", 0, "", 0, -1, -1, -1, 0),
-		_field50(0), _field5C(-1), _field60(0) {	
+		_field50(0), _field5C(-1), _field60(0) {
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h
index 7fd61c38ac..7a42614f43 100644
--- a/engines/titanic/true_talk/tt_word.h
+++ b/engines/titanic/true_talk/tt_word.h
@@ -32,7 +32,7 @@ namespace Titanic {
 /**
  * Types of words
  */
-enum WordClass { 
+enum WordClass {
 	WC_UNKNOWN = 0, WC_ACTION = 1, WC_THING = 2, WC_ABSTRACT = 3,
 	WC_ARTICLE = 4, WC_CONJUNCTION = 5, WC_PRONOUN = 6,
 	WC_PREPOSITION = 7, WC_ADJECTIVE = 8, WC_ADVERB = 9
@@ -155,7 +155,7 @@ public:
 	 * Creates a copy of the word
 	 */
 	virtual TTword *copy() const;
-	
+
 	virtual bool proc2(int val) const { return false; }
 	virtual int proc3() const { return -1; }
 	virtual void proc4() {}
@@ -165,7 +165,7 @@ public:
 	 * Checks whether the word's tag is a known type
 	 */
 	virtual bool checkTag() const { return false; }
-	
+
 	/**
 	 * Compare the word's tag to a given tag value
 	 */
@@ -175,7 +175,7 @@ public:
 	 * Return the tag associated with the word
 	 */
 	virtual uint getTag() const { return 0; }
-	
+
 	virtual bool proc9(int val) const { return false; }
 	virtual int proc10() const { return 0; }
 	virtual void proc11() {}
diff --git a/engines/toon/anim.cpp b/engines/toon/anim.cpp
index 4788ba61a9..c0f0638740 100644
--- a/engines/toon/anim.cpp
+++ b/engines/toon/anim.cpp
@@ -218,7 +218,7 @@ void Animation::drawFrameWithMask(Graphics::Surface &surface, int32 frame, int16
 
 void Animation::drawFrameWithMaskAndScale(Graphics::Surface &surface, int32 frame, int16 xx, int16 yy, int32 zz, Picture *mask, int32 scale) {
 	debugC(5, kDebugAnim, "drawFrameWithMaskAndScale(surface, %d, %d, %d, %d, mask, %d)", frame, xx, yy, zz, scale);
-	
+
 	int16 dataFrame = frame;
 
 	if (_frames[frame]._ref != -1)
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 7b7b41f0aa..2dd03ab9c3 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -240,7 +240,7 @@ GfxSurface::GfxSurface() : Graphics::Screen(0, 0), _bounds(0, 0, SCREEN_WIDTH, S
 GfxSurface::GfxSurface(const GfxSurface &s): Graphics::Screen(0, 0) {
 	free();		// Free the 0x0 surface allocated by Graphics::Screen
 	_lockSurfaceCtr = 0;
-	
+
 	operator=(s);
 }
 
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index b94b82f423..9b393132d9 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -115,7 +115,7 @@ void TSageEngine::initialize() {
 #ifdef TSAGE_SHERLOCK_ENABLED
 		g_resourceManager->addLib("SF3.RLB");
 		g_globals = new Globals();
-	
+
 		return;
 #endif
 	}
diff --git a/engines/voyeur/screen.cpp b/engines/voyeur/screen.cpp
index 62f609c5c7..ca9248398f 100644
--- a/engines/voyeur/screen.cpp
+++ b/engines/voyeur/screen.cpp
@@ -334,7 +334,7 @@ void Screen::sDrawPic(DisplayResource *srcDisplay, DisplayResource *destDisplay,
 								destP += width2 + widthDiff2;
 							}
 
-							addDirtyRect(Common::Rect(offset.x, offset.y, offset.x + width2, 
+							addDirtyRect(Common::Rect(offset.x, offset.y, offset.x + width2,
 								offset.y + height1));
 						}
 					}
diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 4d7c9e917e..68985d8d0c 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -138,10 +138,10 @@ static const PlainGameDescriptor wintermuteGames[] = {
 
 static const WMEGameDescription gameDescriptions[] = {
 	// Five Lethal Demons
-	WME_WINENTRY("5ld", "", 
+	WME_WINENTRY("5ld", "",
 		WME_ENTRY1s("data.dcp", "1037a77cbd001e0644898addc022322c", 15407750), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Five Magical Amulets (Czech)
-	WME_WINENTRY("5ma", "", 
+	WME_WINENTRY("5ma", "",
 		WME_ENTRY2s("czech.dcp", "7b2515a8ceb955c72bc14f0f1fca869e", 184,
 					"data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498), Common::CZ_CZE, ADGF_UNSTABLE, WME_1_7_0),
 	// Five Magical Amulets (English)
@@ -157,99 +157,99 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("polish.dcp", "bb877d48795471a17f25b0b5109100d1", 1132197,
 					"data.dcp", "0134e92bcd5fd2837df3971087e96067", 163316498), Common::PL_POL, ADGF_UNSTABLE, WME_1_7_0),
 	// Actual Destination
-	WME_WINENTRY("actualdest", "", 
+	WME_WINENTRY("actualdest", "",
 		WME_ENTRY1s("data.dcp", "6926f44b26f21ceb1d840eaab9aeb510", 9081740), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Boredom of Agustin Cordes
-	WME_WINENTRY("agustin", "", 
+	WME_WINENTRY("agustin", "",
 		WME_ENTRY1s("data.dcp", "abb79c16c9b92e9b06525a4c7c3f5861", 2461949), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Beyond the Threshold
-	WME_WINENTRY("bthreshold", "", 
+	WME_WINENTRY("bthreshold", "",
 		WME_ENTRY1s("data.dcp", "d49bf9ccb2e74507447c82d6ad3e2bc4", 12773712), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Bickadoodle
-	WME_WINENTRY("bickadoodle", "", 
+	WME_WINENTRY("bickadoodle", "",
 		WME_ENTRY1s("data.dcp", "84db4d1594cac95e25614985775d10a8", 35303844), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Bickadoodle (Ver 1.1)
-	WME_WINENTRY("bickadoodle", "Version 1.1", 
+	WME_WINENTRY("bickadoodle", "Version 1.1",
 		WME_ENTRY1s("data.dcp", "8bb52ac9a9ee129c5059e8e808b669d7", 35337760), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Bickadoodle (Ver 1.2)
 	WME_WINENTRY("bickadoodle", "Version 1.2",
 		WME_ENTRY1s("data.dcp", "1796a48f3ed72dd785ce93334ab883cc", 35337760), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
-	WME_WINENTRY("bickadoodle", "", 
+	WME_WINENTRY("bickadoodle", "",
 		WME_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Book of Gron Part One
-	WME_WINENTRY("bookofgron", "", 
+	WME_WINENTRY("bookofgron", "",
 		WME_ENTRY1s("data.dcp", "e61b2ebee044a82fa0f8ca0fce2c8946", 83129531), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 4 - East Side Story (Demo)
-	WME_WINENTRY("carolreed4", "Demo", 
+	WME_WINENTRY("carolreed4", "Demo",
 		WME_ENTRY1s("data.dcp", "b3f8b09bb4b05ee3e9d14697525257f9", 59296246), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Carol Reed 4 - East Side Story
-	WME_WINENTRY("carolreed4", "", 
+	WME_WINENTRY("carolreed4", "",
 		WME_ENTRY1s("data.dcp", "b26377797f060afc2d440d820100c1ce", 529320536), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 5 - The Colour of Murder
-	WME_WINENTRY("carolreed5", "", 
+	WME_WINENTRY("carolreed5", "",
 		WME_ENTRY1s("data.dcp", "3fcfca44209545d0e26774156427b494", 603660415), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 5 - The Colour of Murder (1.0 Demo)
 	WME_WINENTRY("carolreed5", "Demo",
 		WME_ENTRY1s("data.dcp", "27b3efc018ade5ee8f4adf08b4e3c0dd", 92019500), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Carol Reed 6 - Black Circle
-	WME_WINENTRY("carolreed6", "", 
+	WME_WINENTRY("carolreed6", "",
 		WME_ENTRY1s("data.dcp", "0e4c532beecf23d85012168753f41189", 456258147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 7 - Blue Madonna (Demo)
-	WME_WINENTRY("carolreed7", "Demo", 
+	WME_WINENTRY("carolreed7", "Demo",
 		WME_ENTRY1s("data.dcp", "0372ad0c775266f6355e9e8ae397a2f1", 103719442), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Carol Reed 7 - Blue Madonna
-	WME_WINENTRY("carolreed7", "", 
+	WME_WINENTRY("carolreed7", "",
 		WME_ENTRY1s("data.dcp", "24e3db3e2fabfc956713796d87a3efb0", 495471147), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 8 - Amber's Blood
-	WME_WINENTRY("carolreed8", "", 
+	WME_WINENTRY("carolreed8", "",
 		WME_ENTRY1s("data.dcp", "859d16b0d5b9b255e470cbded2c6cedc", 502714557), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Carol Reed 9 - Cold Case Summer
-	WME_WINENTRY("carolreed9", "", 
+	WME_WINENTRY("carolreed9", "",
 		WME_ENTRY1s("data.dcp", "2b343b48a7aee508d728a546b414a255", 620005266), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Chivalry is Not Dead
-	WME_WINENTRY("chivalry", "", 
+	WME_WINENTRY("chivalry", "",
 		WME_ENTRY1s("data.dcp", "ebd0915d9a12df5224be22f53bb23eb6", 7278306), Common::EN_ANY, ADGF_NO_FLAGS, LATEST_VERSION),
 	// Chivalry is Not Dead (Version from deirdrakai.com)
-	WME_WINENTRY("chivalry", "", 
+	WME_WINENTRY("chivalry", "",
 		WME_ENTRY1s("data.dcp", "ae6d91b9517f4d2851a8ad94c96951c8", 7278302), Common::EN_ANY, ADGF_NO_FLAGS, LATEST_VERSION),
 	// Conspiracao Dumont
-	WME_WINENTRY("conspiracao", "", 
+	WME_WINENTRY("conspiracao", "",
 		WME_ENTRY1s("ConspiracaoDumont.exe", "106f3f2c8f18bb5ffffeed634ace256c", 32908032), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Corrosion: Cold Winter Waiting
-	WME_WINENTRY("corrosion", "", 
+	WME_WINENTRY("corrosion", "",
 		WME_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618), Common::EN_ANY, ADGF_NO_FLAGS, LATEST_VERSION),
 	// Dead City (Czech)
 	// The Czech data are in data.dcp, so in this case we'll have to
 	// just detect the english version twice, to give the user a choice.
 	WME_WINENTRY("deadcity", "",
-		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935, 
+		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935,
 					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dead City (English)
 	WME_WINENTRY("deadcity", "",
-		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935, 
+		WME_ENTRY2s("english.dcp", "c591046d6de7e381d76f70e0787b2b1f", 415935,
 					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dead City (Italian)
 	WME_WINENTRY("deadcity", "",
-		WME_ENTRY2s("italian.dcp", "92d8efb94436bec7bd1b7fe0b548192e", 454037, 
+		WME_ENTRY2s("italian.dcp", "92d8efb94436bec7bd1b7fe0b548192e", 454037,
 					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dead City (Russian)
 	WME_WINENTRY("deadcity", "",
-		WME_ENTRY2s("russian.dcp", "a0ae71e9e1185596fffb07ad2c951eb9", 653317, 
+		WME_ENTRY2s("russian.dcp", "a0ae71e9e1185596fffb07ad2c951eb9", 653317,
 					"data.dcp", "7ebfd50d1a22370ed7b079bcaa631d62", 9070205), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dirty Split (Czech)
 	WME_WINENTRY("dirtysplit", "",
-		WME_ENTRY2s("czech.dcp", "08a71446467cf8f9444cfea446b46ad6", 127697934, 
+		WME_ENTRY2s("czech.dcp", "08a71446467cf8f9444cfea446b46ad6", 127697934,
 					"data.dcp", "8b4b81b718bf65f30a67fc0b1e329eb5", 88577623), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dirty Split (English)
-	WME_WINENTRY("dirtysplit", "", 
+	WME_WINENTRY("dirtysplit", "",
 		WME_ENTRY1s("data.dcp", "8f3dae199361ece0f59fb20cfff6eed3", 88577621), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dirty Split (French)
 	WME_WINENTRY("dirtysplit", "",
-		WME_ENTRY2s("french.dcp", "a0508dedebd0fe478d0158fa4c2a1136", 125534323, 
+		WME_ENTRY2s("french.dcp", "a0508dedebd0fe478d0158fa4c2a1136", 125534323,
 					"data.dcp", "e6d70c7f5d181b761cfcf974adf9186a", 88577623), Common::FR_FRA, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dirty Split (German)
-	WME_WINENTRY("dirtysplit", "", 
+	WME_WINENTRY("dirtysplit", "",
 		WME_ENTRY1s("data.dcp", "139d8a25579e969f8b37d20e6e3de5f9", 92668291), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dirty Split (Italian)
 	WME_WINENTRY("dirtysplit", "",
@@ -260,36 +260,36 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("spanish.dcp", "b3982c0a5e85b42e1e38240fef004aa4", 164428596,
 					"data.dcp", "63766d6c68b9f00b632ea1736fc8a95c", 88577621), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
 	// Des Reves Elastiques Avec Mille Insectes Nommes Georges
-	WME_WINENTRY("dreaming", "", 
+	WME_WINENTRY("dreaming", "",
 		WME_ENTRY1s("data.dcp", "4af26d97ea063fc1277ce30ae431de90", 8804073), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Dreamscape
-	WME_WINENTRY("dreamscape", "", 
+	WME_WINENTRY("dreamscape", "",
 		WME_ENTRY1s("data.dcp",  "7a5752ed4446c862be9f02d7932acf54", 17034377), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Escape from the Mansion
-	WME_WINENTRY("escapemansion", "Beta 1", 
+	WME_WINENTRY("escapemansion", "Beta 1",
 		WME_ENTRY1s("data.dcp",  "d8e348b2312cc36a929cad75f12e0b3a", 21452380), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Escape from the Mansion
-	WME_WINENTRY("escapemansion", "Beta 2", 
+	WME_WINENTRY("escapemansion", "Beta 2",
 		WME_ENTRY1s("data.dcp",  "ded5fa6c5f2afdaf2cafb53e52cd3dd8", 21455763), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Escape from the Mansion
-	WME_WINENTRY("escapemansion", "1.3", 
+	WME_WINENTRY("escapemansion", "1.3",
 		WME_ENTRY1s("data.dcp",  "1e5d231b56c8a228cd15cb690f50253e", 29261972), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Four
-	WME_WINENTRY("four", "", 
+	WME_WINENTRY("four", "",
 		WME_ENTRY1s("data.dcp", "ec05cd5e37c9a524053b8859635a4234", 62599855), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Framed
-	WME_WINENTRY("framed", "", 
+	WME_WINENTRY("framed", "",
 		WME_ENTRY1s("data.dcp",  "e7259fb36f2c6f9f28242291e0c3de98", 34690568), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Ghost in the Sheet
 	WME_WINENTRY("ghostsheet", "",
 		WME_ENTRY2s("english.dcp", "e6d0aad2c89996bcabe416105a3d6d3a", 12221017,
 					"data.dcp", "b2f8b05328e4881e15e98e845b63f451", 168003), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Ghost in the Sheet (Demo)
-	WME_WINENTRY("ghostsheet", "Demo", 
+	WME_WINENTRY("ghostsheet", "Demo",
 		WME_ENTRY1s("data.dcp", "dc1f6595f412ac25a52eaf47dad4ab81", 169083), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Hamlet or the last game without MMORPS features, shaders and product placement
-	WME_WINENTRY("hamlet", "", 
-		
+	WME_WINENTRY("hamlet", "",
+
 		WME_ENTRY1s("data.dcp", "f624add957a77c9930529fb28cc2450f", 88183022), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Helga Deep In Trouble (English)
 	WME_WINENTRY("helga", "",
@@ -300,37 +300,37 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("english.dcp", "b3a93e678f0ef97200f691cd1724643f", 135864,
 					"data.dcp", "45134ed93bc391edf148b79cdcbf2a09", 154266028), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// James Peris: No License Nor Control (English)
-	WME_WINENTRY("jamesperis", "", 
+	WME_WINENTRY("jamesperis", "",
 		WME_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// James Peris: No License Nor Control (Spanish)
-	WME_WINENTRY("jamesperis", "", 
+	WME_WINENTRY("jamesperis", "",
 		WME_ENTRY1s("data.dcp", "a420961e170cb7d168a0d2bae2fe5218", 225294032), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
 	// James Peris: No License Nor Control (Demo) (English)
-	WME_WINENTRY("jamesperis", "Demo", 
+	WME_WINENTRY("jamesperis", "Demo",
 		WME_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// James Peris: No License Nor Control (Demo) (Spanish)
-	WME_WINENTRY("jamesperis", "Demo", 
+	WME_WINENTRY("jamesperis", "Demo",
 		WME_ENTRY1s("data.dcp", "edb9f9c7a08993c1e28f4e477b5f9830", 116113507), Common::ES_ESP, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// J.U.L.I.A. (English)
-	WME_WINENTRY("julia", "", 
+	WME_WINENTRY("julia", "",
 		WME_ENTRY1s("data.dcp", "c2264b4f8fcd132d2913ff5b6076a24f", 10109741), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// J.U.L.I.A. (English, Bundle in a box-version)
-	WME_WINENTRY("julia", "Version 1.2", 
+	WME_WINENTRY("julia", "Version 1.2",
 		WME_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// J.U.L.I.A. (English) (Demo)
-	WME_WINENTRY("julia", "Demo", 
+	WME_WINENTRY("julia", "Demo",
 		WME_ENTRY1s("data.dcp", "f0bbc3394555a9811f6050dae428cab6", 7655237), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// J.U.L.I.A. (English) (Greenlight Demo)
-	WME_WINENTRY("julia", "Greenlight Demo", 
+	WME_WINENTRY("julia", "Greenlight Demo",
 		WME_ENTRY1s("data.dcp", "4befd448d36b0dae9c3ab1aa7cb8b78d", 7271886), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Kulivocko (Czech)
-	WME_WINENTRY("kulivocko", "", 
+	WME_WINENTRY("kulivocko", "",
 		WME_ENTRY1s("data.dcp", "44306dc470e9b27474043932eccee02f", 155106392), Common::CZ_CZE, ADGF_UNSTABLE, LATEST_VERSION),
 	// Kulivocko (Czech) (Demo)
-	WME_WINENTRY("kulivocko", "Demo", 
+	WME_WINENTRY("kulivocko", "Demo",
 		WME_ENTRY1s("data.dcp", "63b164bdfadecbb0deb5da691afb8154", 48362234), Common::CZ_CZE, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Life In 3 Minutes
-	WME_WINENTRY("lifein3minutes", "", 
+	WME_WINENTRY("lifein3minutes", "",
 		WME_ENTRY1s("data.dcp", "c6368950e37a95bf098b02b4eaa5b929", 141787214), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Looky Demo (English)
 	WME_WINENTRY("looky", "Demo",
@@ -345,10 +345,10 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("german.dcp", "bf4c2b8c26342342441a6d64934ab832", 107027865,
 					"data.dcp", "50de0beaa5ad621aa9f020df901d1e74", 1342214), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
 	// Mirage
-	WME_WINENTRY("mirage", "", 
+	WME_WINENTRY("mirage", "",
 		WME_ENTRY1s("data.dcp", "d230b0b99c0aa77b9ecd094d8ee5573b", 17844056), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Oknytt
-	WME_WINENTRY("oknytt", "Version 1.0", 
+	WME_WINENTRY("oknytt", "Version 1.0",
 		WME_ENTRY1s("data.dcp", "6456cf8f429905c83f07509f9da536dd", 109502959), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Oknytt (Version 1.13 English) (These are detected along with d_sounds.dcp to avoid mass-detecting in the languages-subfolder.)
 	WME_WINENTRY("oknytt", "Version 1.13",
@@ -367,25 +367,25 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("spanish.dcp", "10c46152cb29581671f3b6b7c229c957", 319406572,
 					"d_sounds.dcp", "7d04dff8ca11174486bd4b7a80fdcabb", 154943401), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
 	// Night Train Demo
-	WME_WINENTRY("nighttrain", "", 
+	WME_WINENTRY("nighttrain", "",
 		WME_ENTRY1s("data.dcp", "5a027ef84b083a730c9a4c85ec1d3a32", 131760816), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Paintaria
-	WME_WINENTRY("paintaria", "", 
+	WME_WINENTRY("paintaria", "",
 		WME_ENTRY1s("data.dcp", "354c08440c98150ff0d4008dd2865880", 48326040), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Pigeons in the Park
-	WME_WINENTRY("pigeons", "", 
+	WME_WINENTRY("pigeons", "",
 		WME_ENTRY1s("data.dcp", "9143a5b6ff8206aefe3c4c643add3ec7", 2611100), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Project: Doom
-	WME_WINENTRY("projectdoom", "", 
+	WME_WINENTRY("projectdoom", "",
 		WME_ENTRY1s("data.dcp", "d5894b65a40706845434b99870bcab92", 99223761), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Project Joe
-	WME_WINENTRY("projectjoe", "", 
+	WME_WINENTRY("projectjoe", "",
 		WME_ENTRY1s("data.dcp", "ada3c08542901295076b5349e655e73f", 160780037), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Project Lonely Robot
-	WME_WINENTRY("lonelyrobot", "beta", 
+	WME_WINENTRY("lonelyrobot", "beta",
 		WME_ENTRY1s("data.dcp", "a0cf7ad5bab957416dcda454e9f28ef0", 3420120), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Reversion: The Escape Version 1.0
-	WME_WINENTRY("reversion1", "Version 1.0", 
+	WME_WINENTRY("reversion1", "Version 1.0",
 		WME_ENTRY1s("data.dcp", "cd616f98ebfd047e0c540b50b4b70761", 254384531), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Reversion: The Escape Version 1.1 (Chinese)
 	WME_WINENTRY("reversion1", "Version 1.1",
@@ -476,7 +476,7 @@ static const WMEGameDescription gameDescriptions[] = {
 		WME_ENTRY2s("xlanguage_en.dcp", "ca357d86618d1ab76a21c913f4403cbd", 8414976,
 					"data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Reversion: The Meeting (Spanish)
-	WME_WINENTRY("reversion2", "", 
+	WME_WINENTRY("reversion2", "",
 		WME_ENTRY1s("data.dcp", "f7938cbfdc48f07934550245a3286921", 255672016), Common::ES_ESP, ADGF_UNSTABLE, LATEST_VERSION),
 	// Reversion: The Meeting Version 2.0.2412 (Chinese)
 	WME_PLATENTRY("reversion2", "Version 2.0.2412",
@@ -489,79 +489,79 @@ static const WMEGameDescription gameDescriptions[] = {
 					"xlanguage_en.dcp", "0598bf752ce93b42bcaf1094df537c7b", 8533057,
 					"Linux.dcp", "21858bd77dc86b03f701fd47900e2f51", 984535), Common::EN_ANY, Common::kPlatformLinux, ADGF_UNSTABLE, LATEST_VERSION),
 	// Rhiannon: Curse of the four Branches
-	WME_WINENTRY("rhiannon", "", 
+	WME_WINENTRY("rhiannon", "",
 		WME_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Rhiannon: Curse of the four Branches (English PC DVD)
-	WME_WINENTRY("rhiannon", "DVD", 
+	WME_WINENTRY("rhiannon", "DVD",
 		WME_ENTRY1s("data.dcp", "6736bbc921bb6ce5161b3ad095a97bd4", 1053441028), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
-	WME_WINENTRY("ritter", "", 
+	WME_WINENTRY("ritter", "",
 		WME_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278), Common::DE_DEU, ADGF_UNSTABLE, LATEST_VERSION),
 	// Satan and Son
-	WME_WINENTRY("satanandson", "", 
+	WME_WINENTRY("satanandson", "",
 		WME_ENTRY1s("data.dcp",  "16a6ba8174b697bbba9299619d1e20c4", 67539054), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Rosemary
-	WME_WINENTRY("rosemary", "", 
+	WME_WINENTRY("rosemary", "",
 		WME_ENTRY1s("data.dcp", "4f2631138bd4d27587d9043f8aeff3df", 29483643), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Securanote
-	WME_PLATENTRY("securanote", "", 
+	WME_PLATENTRY("securanote", "",
 		WME_ENTRY1s("data.dcp",  "5213d3e59b9e95b7fbd5c56f7de5341a", 2625554), Common::EN_ANY, Common::kPlatformIOS, ADGF_UNSTABLE, LATEST_VERSION),
 	// Shaban
-	WME_WINENTRY("shaban", "", 
+	WME_WINENTRY("shaban", "",
 		WME_ENTRY1s("data.dcp",  "35f702ca9baabc5c620e0be230195c8a", 755388466), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Shine of a Star
-	WME_WINENTRY("shinestar", "", 
+	WME_WINENTRY("shinestar", "",
 		WME_ENTRY1s("data.dcp", "f05abe9e2427a5e4f73648fa09c4ba8e", 94113060), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Sofia's Debt
-	WME_WINENTRY("sofiasdebt", "", 
+	WME_WINENTRY("sofiasdebt", "",
 		WME_ENTRY1s("SD.exe", "e9515f9ba1a2925bb6733476a826a650", 9915047), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Space Invaders (Demo)
-	WME_WINENTRY("spaceinvaders", "Demo", 
+	WME_WINENTRY("spaceinvaders", "Demo",
 		WME_ENTRY1s("data.dcp", "3f27adefdf72f2c1601cf555c80a509f", 1308361), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// Space Madness
-	WME_WINENTRY("spacemadness", "1.0.2", 
+	WME_WINENTRY("spacemadness", "1.0.2",
 		WME_ENTRY1s("data.dcp",  "b9b83135dc7a9e1b4b5f50195dbeb630", 39546622), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Ancient Mark - Episode 1
-	WME_WINENTRY("theancientmark1", "", 
+	WME_WINENTRY("theancientmark1", "",
 		WME_ENTRY1s("data.dcp", "ca04c26f03b2bd307368b306b297ddd7", 364664692), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Box
-	WME_WINENTRY("thebox", "", 
+	WME_WINENTRY("thebox", "",
 		WME_ENTRY1s("data.dcp", "ec5f0c7e8174e307701447b53afe7e2f", 108372483), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Kite (Version 1.1)
-	WME_WINENTRY("thekite", "Version 1.1", 
+	WME_WINENTRY("thekite", "Version 1.1",
 		WME_ENTRY1s("data.dcp", "92d29428f464469bda2d81b03d4d5c3e", 47332296), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Kite (Version 1.2.e)
-	WME_WINENTRY("thekite", "Version 1.2.e", 
+	WME_WINENTRY("thekite", "Version 1.2.e",
 		WME_ENTRY1s("data.dcp", "92451578b1bdd2b32a1db592a4f6d5fc", 47360539), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Kite (Version 1.2.i) (Italian)
-	WME_WINENTRY("thekite", "Version 1.2.i", 
+	WME_WINENTRY("thekite", "Version 1.2.i",
 		WME_ENTRY1s("data.dcp", "d3435b106a1b3b4c1df8ad596d271586", 47509274), Common::IT_ITA, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Kite (Version 1.2.r) (Russian)
-	WME_WINENTRY("thekite", "Version 1.2.r", 
+	WME_WINENTRY("thekite", "Version 1.2.r",
 		WME_ENTRY1s("data.dcp", "d531e097dd884737469da014ed882cde", 47554582 ), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Kite (Version 1.3.e)
-	WME_WINENTRY("thekite", "Version 1.3.e", 
+	WME_WINENTRY("thekite", "Version 1.3.e",
 		WME_ENTRY1s("data.dcp", "9761827b51370263b7623721545d7627", 47382987), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Fairy Tales About Toshechka and Boshechka
-	WME_WINENTRY("tib", "", 
+	WME_WINENTRY("tib", "",
 		WME_ENTRY1s("data.dcp", "87d296ef3f46570ed18f000d3885db77", 340264526), Common::RU_RUS, ADGF_UNSTABLE, LATEST_VERSION),
 	// The Trader of Stories
-	WME_WINENTRY("tradestory", "Demo", 
+	WME_WINENTRY("tradestory", "Demo",
 		WME_ENTRY1s("data.dcp", "0a0b51191636cc8ead89b905281c3218", 40401902), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// the white chamber (multi-language)
-	WME_WINENTRY("twc", "", 
+	WME_WINENTRY("twc", "",
 		WME_ENTRY1s("data.dcp", "0011d01142547c61e51ba24dc42b579e", 186451273), Common::UNK_LANG, ADGF_UNSTABLE, LATEST_VERSION),
 	// Vsevolod Prologue (Demo)
-	WME_WINENTRY("vsevolod", "Prologue", 
+	WME_WINENTRY("vsevolod", "Prologue",
 		WME_ENTRY1s("data.dcp", "f2dcffd2692dbfcc9371fa1a87970fe7", 388669493), Common::EN_ANY, ADGF_UNSTABLE | ADGF_DEMO, LATEST_VERSION),
 	// War
-	WME_WINENTRY("war", "", 
+	WME_WINENTRY("war", "",
 		WME_ENTRY1s("data.dcp", "003e317cda6d0137bbd5e5d7f089ee4d", 32591890), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Wilma Tetris
-	WME_WINENTRY("wtetris", "", 
+	WME_WINENTRY("wtetris", "",
 		WME_ENTRY1s("data.dcp", "946e3a0496e6c12fb344c9ed861ff015", 2780093), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	// Zilm: A Game of Reflex 1.0
-	WME_WINENTRY("Zilm", "1.0", 
+	WME_WINENTRY("Zilm", "1.0",
 		WME_ENTRY1s("data.dcp",  "098dffaf03d8adbb4cb5633e4733e63c", 351726), Common::EN_ANY, ADGF_UNSTABLE, LATEST_VERSION),
 	{
 		AD_TABLE_END_MARKER,
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 4d791b9c7b..dc2b65885e 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -149,7 +149,7 @@ bool InventoryItems::discardItem(int itemIndex) {
 			sort();
 
 			return true;
-		}		
+		}
 	}
 
 	return true;
@@ -277,7 +277,7 @@ Common::String WeaponItems::getFullDescription(int itemIndex, int displayNum) {
 		displayNum,
 		Res.WEAPON_NAMES[i._id],
 		!i._bonusFlags ? "" : Res.BONUS_NAMES[i._bonusFlags & ITEMFLAG_BONUS_MASK],
-		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) || 
+		(i._bonusFlags & (ITEMFLAG_BROKEN | ITEMFLAG_CURSED)) ||
 			!i._bonusFlags ? "\b " : ""
 	);
 }
@@ -315,7 +315,7 @@ Common::String WeaponItems::getAttributes(XeenItem &item, const Common::String &
 		maxVal += Res.METAL_DAMAGE[item._material - 37];
 		toHit = Common::String::format("%+d", Res.METAL_DAMAGE_PERCENT[item._material - 37]);
 	}
-	
+
 	physDamage = Common::String::format(Res.DAMAGE_X_TO_Y, minVal, maxVal);
 
 	// Next handle elemental/attribute damage
@@ -471,7 +471,7 @@ Common::String ArmorItems::getAttributes(XeenItem &item, const Common::String &c
 			int eCategory = ELEM_FIRE;
 			while (eCategory < ELEM_MAGIC && Res.ELEMENTAL_CATEGORIES[eCategory] < item._material)
 				++eCategory;
-				
+
 			elemResist = Common::String::format(Res.ATTR_XY_BONUS, resistence,
 				Res.ELEMENTAL_NAMES[eCategory]);
 		}
@@ -617,7 +617,7 @@ Common::String MiscItems::getAttributes(XeenItem &item, const Common::String &cl
 	}
 
 	return Common::String::format(Res.ITEM_DETAILS, classes.c_str(),
-		Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE, 
+		Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE, Res.FIELD_NONE,
 		Res.FIELD_NONE, specialPower.c_str());
 }
 /*------------------------------------------------------------------------*/
@@ -743,7 +743,7 @@ void Character::synchronize(Common::Serializer &s) {
 	_level.synchronize(s);
 	s.syncAsByte(_birthDay);
 	s.syncAsByte(_tempAge);
-	
+
 	// Synchronize the skill list
 	for (int idx = 0; idx < 18; ++idx)
 		s.syncAsByte(_skills[idx]);
@@ -760,7 +760,7 @@ void Character::synchronize(Common::Serializer &s) {
 
 	// Synchronize spell list
 	for (int i = 0; i < MAX_SPELLS_PER_CLASS - 1; ++i)
-		s.syncAsByte(_spells[i]);	
+		s.syncAsByte(_spells[i]);
 	s.syncAsByte(_lloydMap);
 	s.syncAsByte(_lloydPosition.x);
 	s.syncAsByte(_lloydPosition.y);
@@ -784,7 +784,7 @@ void Character::synchronize(Common::Serializer &s) {
 	_poisonResistence.synchronize(s);
 	_energyResistence.synchronize(s);
 	_magicResistence.synchronize(s);
-	
+
 	for (int i = 0; i < 16; ++i)
 		s.syncAsByte(_conditions[i]);
 
@@ -1025,7 +1025,7 @@ bool Character::noActions() {
 	case IN_LOVE:
 	case DRUNK: {
 		Common::String msg = Common::String::format(Res.IN_NO_CONDITION, _name.c_str());
-		ErrorScroll::show(Party::_vm, msg, 
+		ErrorScroll::show(Party::_vm, msg,
 			Party::_vm->_mode == 17 ? WT_2 : WT_NONFREEZED_WAIT);
 		return true;
 	}
@@ -1170,7 +1170,7 @@ int Character::itemScan(int itemId) const {
 
 					if (itemId > 10 && item._material < 37) {
 						int mIndex = item.getElementalCategory() + 11;
-						
+
 						if (mIndex == itemId)
 							result += Res.ELEMENTAL_RESISTENCES[item._material];
 					}
@@ -1754,7 +1754,7 @@ int Character::makeItem(int p1, int itemIndex, int p3) {
 void Character::addHitPoints(int amount) {
 	Interface &intf = *Party::_vm->_interface;
 	Common::fill(&intf._charFX[0], &intf._charFX[MAX_ACTIVE_PARTY], 0);
-	
+
 	if (!isDead()) {
 		int maxHp = getMaxHP();
 		if (_currentHp <= maxHp) {
@@ -1824,11 +1824,11 @@ int Character::getClassCategory() const {
 	case CLASS_ARCHER:
 	case CLASS_SORCERER:
 		return 1;
-		
+
 	case CLASS_DRUID:
 	case CLASS_RANGER:
 		return 2;
-		
+
 	default:
 		return 0;
 	}
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 9282b4e75b..bc01e87618 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -139,7 +139,7 @@ void Combat::giveCharDamage(int damage, DamageType attackType, int charIndex) {
 	bool breakFlag = false;
 
 	screen.closeWindows();
-	
+
 	int idx = (int)party._activeParty.size();
 	if (!scripts._v2) {
 		for (idx = 0; idx < (int)party._activeParty.size(); ++idx) {
@@ -611,7 +611,7 @@ void Combat::monstersAttack() {
 		intf.draw3d(true);
 		events.pollEventsAndWait();
 	} while (!_vm->shouldQuit() && intf._isAttacking);
-	
+
 	endAttack();
 
 	if (_vm->_mode != MODE_COMBAT) {
@@ -645,7 +645,7 @@ void Combat::setupMonsterAttack(int monsterDataIndex, const Common::Point &pt) {
 	for (int idx = 0; idx < 36; ++idx) {
 		if (_gmonHit[idx] != -1) {
 			int result = stopAttack(pt - party._mazePosition);
-			if (result) {	
+			if (result) {
 				_monstersAttacking = true;
 				_gmonHit[idx] = monsterDataIndex;
 
@@ -877,7 +877,7 @@ void Combat::doMonsterTurn(int monsterId) {
 				if (cond >= PARALYZED && cond <= ERADICATED) {
 					Common::Array<int> ableChars;
 					bool skip = false;
-					
+
 					for (uint idx = 0; idx < _combatParty.size() && !skip; ++idx) {
 						switch (_combatParty[idx]->worstCondition()) {
 						case PARALYZED:
@@ -976,7 +976,7 @@ int Combat::stopAttack(const Common::Point &diffPt) {
 				}
 			}
 			return dir == DIR_WEST ? diffPt.x * -1 + 1 : 1;
-		
+
 		} else if (diffPt.y <= 0) {
 			for (int y = diffPt.y; y < 0; ++y) {
 				int v = map.mazeLookup(Common::Point(mazePos.x, mazePos.y + y), 4);
@@ -1032,7 +1032,7 @@ int Combat::stopAttack(const Common::Point &diffPt) {
 					return 0;
 			}
 			return dir == DIR_WEST ? diffPt.x * -1 + 1 : 1;
-		
+
 		} else if (diffPt.y <= 0) {
 			for (int y = diffPt.y; y < 0; ++y) {
 				int v = map.mazeLookup(Common::Point(mazePos.x, mazePos.y + y), 0, 0x8000);
@@ -1256,7 +1256,7 @@ void Combat::attack(Character &c, RangeType rangeType) {
 						break;
 					}
 				}
-			} 
+			}
 		} else {
 			Common::fill(&_elemPow[0], &_elemPow[PARTY_AND_MONSTERS], ELEM_FIRE);
 			damage = 0;
@@ -1392,7 +1392,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
 			damage += 100;
 		if (monster._damageType == DT_SLEEP || monster._damageType == DT_DRAGONSLEEP)
 			monster._damageType = DT_PHYSICAL;
-		
+
 		if ((!rangeType || !_damageType) && _attackWeaponId != 34) {
 			if (monsterData._phsyicalResistence != 0) {
 				if (monsterData._phsyicalResistence == 100) {
@@ -1446,14 +1446,14 @@ void Combat::attack2(int damage, RangeType rangeType) {
 				break;
 			}
 		}
-		
+
 		if (damage < 1) {
 			sound.playSound(_missVoc, 1);
 			sound.playFX(6);
 		} else {
 			_monsterScale[_monsterIndex] = getDamageScale(damage);
 			intf.draw3d(true);
-			
+
 			sound.stopSound();
 			File powVoc(Common::String::format("pow%d.voc",
 				POW_WEAPON_VOCS[_attackWeaponId]));
@@ -1506,7 +1506,7 @@ void Combat::attack2(int damage, RangeType rangeType) {
 				if (MONSTER_ITEM_RANGES[itemDrop] >= _vm->getRandomNumber(1, 100)) {
 					Character tempChar;
 					int category = tempChar.makeItem(itemDrop, 0, 0);
-					
+
 					switch (category) {
 					case CATEGORY_WEAPON:
 						for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) {
@@ -1609,7 +1609,7 @@ bool Combat::hitMonster(Character &c, RangeType rangeType) {
 	getWeaponDamage(c, rangeType);
 	int chance = c.statBonus(c.getStat(ACCURACY)) + _hitChanceBonus;
 	int divisor = 0;
-	
+
 	switch (c._class) {
 	case CLASS_KNIGHT:
 	case CLASS_BARBARIAN:
@@ -1758,7 +1758,7 @@ int Combat::getMonsterResistence(RangeType rangeType) {
 			else if (material < 34)
 				resistence = monsterData._energyResistence;
 			else
-				resistence = monsterData._magicResistence;			
+				resistence = monsterData._magicResistence;
 		}
 	}
 
@@ -1767,7 +1767,7 @@ int Combat::getMonsterResistence(RangeType rangeType) {
 			return 0;
 		else
 			return ((100 - resistence) * damage) / 100;
-	} 
+	}
 
 	return damage;
 }
@@ -1840,7 +1840,7 @@ void Combat::multiAttack(int powNum) {
 	int monsterIndex = _monsterIndex;
 	int monster2Attack = _monster2Attack;
 	bool attackedFlag = false;
-	
+
 	Common::Array<int> attackMonsters;
 	for (int idx = 0; idx < 3; ++idx) {
 		if (_attackMonsters[idx] != -1)
diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp
index 1924c69cf4..3304689416 100644
--- a/engines/xeen/dialogs.cpp
+++ b/engines/xeen/dialogs.cpp
@@ -45,7 +45,7 @@ void ButtonContainer::restoreButtons() {
 	_buttons = _savedButtons.pop();
 }
 
-void ButtonContainer::addButton(const Common::Rect &bounds, int val, 
+void ButtonContainer::addButton(const Common::Rect &bounds, int val,
 		SpriteResource *sprites) {
 	_buttons.push_back(UIButton(bounds, val, sprites, true));
 }
@@ -80,7 +80,7 @@ bool ButtonContainer::checkEvents(XeenEngine *vm) {
 	} else if (events.isKeyPending()) {
 		Common::KeyState keyState;
 		events.getKey(keyState);
-		
+
 		_buttonValue = keyState.keycode;
 		if (_buttonValue == Common::KEYCODE_KP8)
 			_buttonValue = Common::KEYCODE_UP;
@@ -137,7 +137,7 @@ void CreditsScreen::show(XeenEngine *vm) {
 void CreditsScreen::execute() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
-	
+
 	// Handle drawing the credits screen
 	doScroll(true, false);
 	screen._windows[GAME_WINDOW].close();
@@ -145,7 +145,7 @@ void CreditsScreen::execute() {
 	screen.loadBackground("marb.raw");
 	screen._windows[0].writeString(Res.CREDITS);
 	doScroll(false, false);
-	
+
 	events.setCursor(0);
 	screen._windows[0].update();
 	clearButtons();
diff --git a/engines/xeen/dialogs_automap.cpp b/engines/xeen/dialogs_automap.cpp
index 652494742a..16ce225515 100644
--- a/engines/xeen/dialogs_automap.cpp
+++ b/engines/xeen/dialogs_automap.cpp
@@ -76,7 +76,7 @@ void AutoMapDialog::execute() {
 //	MazeData &mazeData = map.mazeDataCurrent();
 	bool drawFlag = true;
 	int v;
-	
+
 	events.updateGameCounter();
 	do {
 		if (drawFlag)
@@ -106,7 +106,7 @@ void AutoMapDialog::execute() {
 				}
 			}
 
-		
+
 			for (int yp = 38, yDiff = pt.y + 7; yp < 166; yp += 8, --yDiff) {
 				for (int xp = 80, xDiff = -7; xp < 240; xp += 10, ++xDiff) {
 					v = map.mazeLookup(Common::Point(xDiff, yDiff), 8);
@@ -128,7 +128,7 @@ void AutoMapDialog::execute() {
 						map._tileSprites.draw(screen, 0, Common::Point(xp, yp));
 				}
 			}
-			
+
 			// Draw thinner ground tiles on the left edge of the map
 			for (int yp = 43, yDiff = pt.y + 7; yp < 171; yp += 8, --yDiff) {
 				v = map.mazeLookup(Common::Point(pt.x - 8, yDiff), 0, 0xffff);
@@ -137,13 +137,13 @@ void AutoMapDialog::execute() {
 					map._tileSprites.draw(screen, 36 + map.mazeData()._surfaceTypes[
 						map._currentSurfaceId], Common::Point(75, yp));
 			}
-			
+
 			// Draw thin tile portion on top-left corner of map
 			v = map.mazeLookup(Common::Point(pt.x - 8, pt.y + 8), 0, 0xffff);
 			if (v != INVALID_CELL && map._currentSurfaceId != 0 && map._currentSteppedOn)
 				map._tileSprites.draw(screen, 36 + map.mazeData()._surfaceTypes[
 					map._currentSurfaceId], Common::Point(75, 35));
-			
+
 			// Draw any thin tiles at the very top of the map
 			for (int xp = 85, xDiff = pt.x - 7; xp < 245; xp += 10, ++xDiff) {
 				v = map.mazeLookup(Common::Point(xDiff, pt.y + 8), 0, 0xffff);
@@ -165,7 +165,7 @@ void AutoMapDialog::execute() {
 			}
 
 			// Draw walls on left and top edges of map
-			for (int xp = 80, yp = 158, xDiff = pt.x - 7, yDiff = pt.y - 8; xp < 250; 
+			for (int xp = 80, yp = 158, xDiff = pt.x - 7, yDiff = pt.y - 8; xp < 250;
 					xp += 10, yp -= 8, ++xDiff, ++yDiff) {
 				// Draw walls on left edge of map
 				v = map.mazeLookup(Common::Point(pt.x - 8, yDiff), 12);
@@ -385,7 +385,7 @@ void AutoMapDialog::execute() {
 						map._tileSprites.draw(screen, frame, Common::Point(xp, yp));
 				}
 			}
-			
+
 			// Draw overlay on cells that haven't been stepped on yet
 			for (int yDiff = pt.y + 7, yp = 38; yp < 166; --yDiff, yp += 8) {
 				for (int xp = 80, xDiff = pt.x - 7; xp < 240; xp += 10, ++xDiff) {
diff --git a/engines/xeen/dialogs_char_info.cpp b/engines/xeen/dialogs_char_info.cpp
index 6dd79618ed..23f089b93e 100644
--- a/engines/xeen/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs_char_info.cpp
@@ -206,7 +206,7 @@ void CharacterInfo::execute(int charIndex) {
 			goto exit;
 		}
 	} while (!_vm->shouldQuit());
-exit:	
+exit:
 	w.close();
 	intf.unhighlightChar();
 	_vm->_mode = oldMode;
@@ -400,7 +400,7 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) {
 			stat1, stat2);
 		bounds.setHeight(42);
 		break;
-		
+
 	case 11:
 		// Spell Points
 		stat1 = c._currentSp;
diff --git a/engines/xeen/dialogs_error.h b/engines/xeen/dialogs_error.h
index 56e30bc9de..3657cd01be 100644
--- a/engines/xeen/dialogs_error.h
+++ b/engines/xeen/dialogs_error.h
@@ -28,7 +28,7 @@
 
 namespace Xeen {
 
-enum ErrorWaitType { WT_FREEZE_WAIT = 0, WT_NONFREEZED_WAIT = 1, 
+enum ErrorWaitType { WT_FREEZE_WAIT = 0, WT_NONFREEZED_WAIT = 1,
 	WT_2 = 2, WT_3 = 3 };
 
 class ErrorDialog : public ButtonContainer {
@@ -43,7 +43,7 @@ public:
 
 class ErrorScroll {
 public:
-	static void show(XeenEngine *vm, const Common::String &msg, 
+	static void show(XeenEngine *vm, const Common::String &msg,
 		ErrorWaitType waitType = WT_FREEZE_WAIT);
 };
 
diff --git a/engines/xeen/dialogs_info.cpp b/engines/xeen/dialogs_info.cpp
index 945567c9b2..d0cd7c5243 100644
--- a/engines/xeen/dialogs_info.cpp
+++ b/engines/xeen/dialogs_info.cpp
@@ -37,7 +37,7 @@ void InfoDialog::execute() {
 	EventsManager &events = *_vm->_events;
 	Interface &intf = *_vm->_interface;
 	Party &party = *_vm->_party;
-	
+
 	protectionText();
 	Common::String statusText = "";
 	for (uint idx = 0; idx < _lines.size(); ++idx)
diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs_input.cpp
index 943b038d09..5376fb7c46 100644
--- a/engines/xeen/dialogs_input.cpp
+++ b/engines/xeen/dialogs_input.cpp
@@ -26,7 +26,7 @@
 
 namespace Xeen {
 
-int Input::show(XeenEngine *vm, Window *window, Common::String &line, 
+int Input::show(XeenEngine *vm, Window *window, Common::String &line,
 		uint maxLen, int maxWidth, bool isNumeric) {
 	Input *dlg = new Input(vm, window);
 	int result = dlg->getString(line, maxLen, maxWidth, isNumeric);
@@ -129,7 +129,7 @@ int StringInput::show(XeenEngine *vm, bool type, const Common::String &msg1,
 	return result;
 }
 
-int StringInput::execute(bool type, const Common::String &expected, 
+int StringInput::execute(bool type, const Common::String &expected,
 		const Common::String &title, int opcode) {
 	Interface &intf = *_vm->_interface;
 	Screen &screen = *_vm->_screen;
@@ -211,7 +211,7 @@ int Choose123::execute(int numOptions) {
 	Interface &intf = *_vm->_interface;
 	Screen &screen = *_vm->_screen;
 	Town &town = *_vm->_town;
-	
+
 	Mode oldMode = _vm->_mode;
 	_vm->_mode = MODE_DIALOG_123;
 
diff --git a/engines/xeen/dialogs_input.h b/engines/xeen/dialogs_input.h
index ce159c77a3..8221320b22 100644
--- a/engines/xeen/dialogs_input.h
+++ b/engines/xeen/dialogs_input.h
@@ -45,7 +45,7 @@ protected:
 
 	Input(XeenEngine *vm, Window *window) : ButtonContainer(vm), _window(window) {}
 public:
-	static int show(XeenEngine *vm, Window *window, Common::String &line, 
+	static int show(XeenEngine *vm, Window *window, Common::String &line,
 		uint maxLen, int maxWidth, bool isNumeric = false);
 };
 
@@ -53,10 +53,10 @@ class StringInput : public Input {
 protected:
 	StringInput(XeenEngine *vm);
 
-	int execute(bool type, const Common::String &expected, 
+	int execute(bool type, const Common::String &expected,
 		const Common::String &title, int opcode);
 public:
-	static int show(XeenEngine *vm, bool type, const Common::String &msg1, 
+	static int show(XeenEngine *vm, bool type, const Common::String &msg1,
 		const Common::String &msg2, int opcode);
 };
 
diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp
index 56de6a5b17..227b5708e7 100644
--- a/engines/xeen/dialogs_items.cpp
+++ b/engines/xeen/dialogs_items.cpp
@@ -42,9 +42,9 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 	Interface &intf = *_vm->_interface;
 	Party &party = *_vm->_party;
 	Screen &screen = *_vm->_screen;
-	
+
 	Character *startingChar = c;
-	ItemCategory category = mode == ITEMMODE_RECHARGE || mode == ITEMMODE_COMBAT ? 
+	ItemCategory category = mode == ITEMMODE_RECHARGE || mode == ITEMMODE_COMBAT ?
 		CATEGORY_MISC : CATEGORY_WEAPON;
 	int varA = mode == ITEMMODE_COMBAT ? 1 : 0;
 	if (varA != 0)
@@ -88,7 +88,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 					Res.BTN_SELL, Res.BTN_IDENTIFY, Res.BTN_FIX);
 			} else if (mode != ITEMMODE_ENCHANT  && mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD) {
 				msg = Common::String::format(Res.ITEMS_DIALOG_TEXT1,
-					category == 3 ? Res.BTN_USE : Res.BTN_EQUIP, 
+					category == 3 ? Res.BTN_USE : Res.BTN_EQUIP,
 					Res.BTN_REMOVE, Res.BTN_DISCARD, Res.BTN_QUEST);
 			} else if (mode == ITEMMODE_ENCHANT) {
 				msg = Common::String::format(Res.ITEMS_DIALOG_TEXT2, Res.BTN_ENCHANT);
@@ -138,7 +138,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 				_itemsDrawList[idx]._y = 10 + idx * 9;
 
 				switch (category) {
-				case CATEGORY_WEAPON: 
+				case CATEGORY_WEAPON:
 				case CATEGORY_ARMOR:
 				case CATEGORY_ACCESSORY: {
 					XeenItem &i = (category == CATEGORY_WEAPON) ? c->_weapons[idx] :
@@ -147,7 +147,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 					if (i._id) {
 						if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_8
 								|| mode == ITEMMODE_ENCHANT || mode == ITEMMODE_RECHARGE) {
-							lines.push_back(Common::String::format(Res.ITEMS_DIALOG_LINE1, 
+							lines.push_back(Common::String::format(Res.ITEMS_DIALOG_LINE1,
 								arr[idx], idx + 1,
 								c->_items[category].getFullDescription(idx, arr[idx]).c_str()));
 						} else {
@@ -225,7 +225,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 				// Original uses var in this block that's never set?!
 				const int v1 = 0;
 				screen._windows[30].writeString(Common::String::format(Res.AVAILABLE_GOLD_COST,
-					Res.CATEGORY_NAMES[category], 
+					Res.CATEGORY_NAMES[category],
 					v1 ? "" : "s", party._gold,
 					lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(),
 					lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(),
@@ -287,8 +287,8 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			default:
 				break;
 			}
-		} 
-		
+		}
+
 		// If it's time to do an item action, take care of it
 		if (actionIndex >= 0) {
 			int result = doItemOptions(*c, actionIndex, itemIndex, category, mode);
@@ -307,7 +307,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			// Otherwise, result and continue showing dialog
 			actionIndex = -1;
 		}
-		
+
 		// Wait for a selection
 		_buttonValue = 0;
 		while (!_vm->shouldQuit() && !_buttonValue) {
@@ -332,11 +332,11 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 		case Common::KEYCODE_F4:
 		case Common::KEYCODE_F5:
 		case Common::KEYCODE_F6:
-			if (!varA && mode != ITEMMODE_3 && mode != ITEMMODE_ENCHANT 
+			if (!varA && mode != ITEMMODE_3 && mode != ITEMMODE_ENCHANT
 					&& mode != ITEMMODE_RECHARGE && mode != ITEMMODE_TO_GOLD
 					&& party._mazeId != 0) {
 				_buttonValue -= Common::KEYCODE_F1;
-				
+
 				if (_buttonValue < (int)(_vm->_mode == MODE_COMBAT ?
 						combat._combatParty.size() : party._activeParty.size())) {
 					// Character number is valid
@@ -391,7 +391,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			// Select an item
 			if (mode == ITEMMODE_3)
 				break;
-				
+
 			_buttonValue -= Common::KEYCODE_1;
 			if (_buttonValue != itemIndex) {
 				// Check whether the new selection has an associated item
@@ -431,7 +431,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 			if (mode == ITEMMODE_CHAR_INFO)
 				actionIndex = 3;
 			break;
-			
+
 		case Common::KEYCODE_e:
 			if (mode == ITEMMODE_CHAR_INFO || mode == ITEMMODE_ENCHANT ||
 					mode == ITEMMODE_TO_GOLD) {
@@ -447,7 +447,7 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
 				mode = ITEMMODE_REPAIR;
 				c = startingChar;
 				redrawFlag = REDRAW_TEXT;
-			}	
+			}
 			break;
 
 		case Common::KEYCODE_g:
@@ -653,7 +653,7 @@ void ItemsDialog::setEquipmentIcons() {
 					i._frame = 11;
 				break;
 			}
-			
+
 			default:
 				break;
 			}
@@ -684,7 +684,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
 	default:
 		break;
 	}
-	
+
 	switch (category) {
 	case CATEGORY_WEAPON:
 	case CATEGORY_ARMOR:
@@ -694,7 +694,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
 			(mode == 1 ? c->_armor[itemIndex] : c->_accessories[itemIndex]);
 		amount1 = (mode == 0) ? Res.WEAPON_BASE_COSTS[i._id] :
 			(mode == 1 ? Res.ARMOR_BASE_COSTS[i._id] : Res.ACCESSORY_BASE_COSTS[i._id]);
-		
+
 		if (i._material > 36 && i._material < 59) {
 			switch (i._material) {
 			case 37:
@@ -719,7 +719,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
 			amount2 = Res.ELEMENTAL_DAMAGE[i._material] * 100;
 		else if (i._material > 58)
 			amount3 = Res.ELEMENTAL_DAMAGE[i._material - 59 + 7] * 100;
-		
+
 		switch (mode) {
 		case ITEMMODE_BLACKSMITH:
 		case ITEMMODE_2:
@@ -741,7 +741,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
 		XeenItem &i = c->_misc[itemIndex];
 		amount1 = Res.MISC_MATERIAL_COSTS[i._material];
 		amount4 = Res.MISC_BASE_COSTS[i._id];
-		
+
 		switch (mode) {
 		case ITEMMODE_BLACKSMITH:
 		case ITEMMODE_2:
diff --git a/engines/xeen/dialogs_items.h b/engines/xeen/dialogs_items.h
index c161b0721b..cfa6818843 100644
--- a/engines/xeen/dialogs_items.h
+++ b/engines/xeen/dialogs_items.h
@@ -31,7 +31,7 @@ namespace Xeen {
 
 enum ItemsMode {
 	ITEMMODE_CHAR_INFO = 0, ITEMMODE_BLACKSMITH = 1, ITEMMODE_2 = 2, ITEMMODE_3 = 3,
-	ITEMMODE_RECHARGE = 4, ITEMMODE_5 = 5, ITEMMODE_ENCHANT = 6, ITEMMODE_COMBAT = 7, ITEMMODE_8 = 8, 
+	ITEMMODE_RECHARGE = 4, ITEMMODE_5 = 5, ITEMMODE_ENCHANT = 6, ITEMMODE_COMBAT = 7, ITEMMODE_8 = 8,
 	ITEMMODE_REPAIR = 9, ITEMMODE_IDENTIFY = 10, ITEMMODE_TO_GOLD = 11
 };
 
@@ -73,10 +73,10 @@ private:
 	/**
 	 * Calculate the cost of an item
 	 */
-	int calcItemCost(Character *c, int itemIndex, ItemsMode mode, int skillLevel, 
+	int calcItemCost(Character *c, int itemIndex, ItemsMode mode, int skillLevel,
 		ItemCategory category);
 
-	int doItemOptions(Character &c, int actionIndex, int itemIndex, 
+	int doItemOptions(Character &c, int actionIndex, int itemIndex,
 		ItemCategory category, ItemsMode mode);
 
 	void itemToGold(Character &c, int itemIndex, ItemCategory category, ItemsMode mode);
diff --git a/engines/xeen/dialogs_party.cpp b/engines/xeen/dialogs_party.cpp
index 9457173e0e..3dc47d1e9b 100644
--- a/engines/xeen/dialogs_party.cpp
+++ b/engines/xeen/dialogs_party.cpp
@@ -32,7 +32,7 @@
 
 namespace Xeen {
 
-PartyDialog::PartyDialog(XeenEngine *vm) : ButtonContainer(vm), 
+PartyDialog::PartyDialog(XeenEngine *vm) : ButtonContainer(vm),
 		PartyDrawer(vm), _vm(vm) {
 	initDrawStructs();
 }
@@ -264,7 +264,7 @@ void PartyDialog::execute() {
 					startingCharChanged(startingChar);
 				}
 				break;
-		
+
 			default:
 				break;
 			}
@@ -579,11 +579,11 @@ void PartyDialog::createChar() {
 					_buttons[destAttrib + 10]._bounds.left,
 					_buttons[destAttrib + 10]._bounds.top));
 				w.update();
-				
+
 				SWAP(attribs[srcAttrib], attribs[destAttrib]);
 				checkClass(attribs, allowedClasses);
 				classId = -1;
-				selectedClass = newCharDetails(attribs, allowedClasses, 
+				selectedClass = newCharDetails(attribs, allowedClasses,
 					race, sex, classId, selectedClass, msg);
 			} else {
 				icons.draw(w, srcAttrib * 2 + 10, Common::Point(
@@ -642,7 +642,7 @@ void PartyDialog::createChar() {
 		if (_buttonValue != Common::KEYCODE_PAGEDOWN) {
 			selectedClass = newCharDetails(attribs, allowedClasses,
 				race, sex, classId, selectedClass, msg);
-			
+
 			for (int idx = 0; idx < 7; ++idx)
 				icons.draw(w, 10 + idx * 2, Common::Point(168, 19 + idx * 24));
 			for (int idx = 0; idx < 10; ++idx)
@@ -656,7 +656,7 @@ void PartyDialog::createChar() {
 			icons.draw(w, 61, Common::Point(220, 19));
 			icons.draw(w, 64, Common::Point(220, 155));
 			icons.draw(w, 65, Common::Point(220, 170));
-			
+
 			party._roster[freeCharList[charIndex]]._faceSprites->draw(w, 0,
 				Common::Point(27, 102));
 
@@ -675,7 +675,7 @@ void PartyDialog::createChar() {
 			}
 		}
 
-		// Move to next available class, or if the code block above resulted in 
+		// Move to next available class, or if the code block above resulted in
 		// selectedClass being -1, move to select the first available class
 		for (int tempClass = selectedClass + 1; tempClass <= CLASS_RANGER; ++tempClass) {
 			if (allowedClasses[tempClass]) {
@@ -686,7 +686,7 @@ void PartyDialog::createChar() {
 
 		printSelectionArrow(icons, selectedClass);
 	} while (!_vm->shouldQuit() && _buttonValue != Common::KEYCODE_ESCAPE);
-		
+
 	_vm->_mode = oldMode;
 }
 
@@ -707,7 +707,7 @@ int PartyDialog::selectCharacter(bool isDelete, int firstDisplayChar) {
 	w.update();
 
 	saveButtons();
-	addButton(Common::Rect(225, isDelete ? 120 : 84, 249, isDelete ? 140 : 104), 
+	addButton(Common::Rect(225, isDelete ? 120 : 84, 249, isDelete ? 140 : 104),
 		Common::KEYCODE_ESCAPE, &iconSprites);
 	addButton(Common::Rect(16, 16, 48, 48), Common::KEYCODE_1);
 	addButton(Common::Rect(117, 16, 149, 48), Common::KEYCODE_2);
@@ -755,7 +755,7 @@ int PartyDialog::selectCharacter(bool isDelete, int firstDisplayChar) {
 		default:
 			break;
 		}
-	} 
+	}
 
 	w.close();
 	restoreButtons();
@@ -802,7 +802,7 @@ void PartyDialog::checkClass(const uint attribs[TOTAL_ATTRIBUTES], bool allowedC
 }
 
 int PartyDialog::newCharDetails(const uint attribs[TOTAL_ATTRIBUTES],
-		bool allowedClasses[TOTAL_CLASSES], Race race, Sex sex, int classId, 
+		bool allowedClasses[TOTAL_CLASSES], Race race, Sex sex, int classId,
 		int selectedClass, Common::String &msg) {
 	int foundClass = -1;
 	Common::String skillStr, classStr, raceSkillStr;
diff --git a/engines/xeen/dialogs_party.h b/engines/xeen/dialogs_party.h
index 17ec4fd300..84b98579e1 100644
--- a/engines/xeen/dialogs_party.h
+++ b/engines/xeen/dialogs_party.h
@@ -78,7 +78,7 @@ private:
 	/**
 	 * Return details of the generated character
 	 */
-	int newCharDetails(const uint attribs[TOTAL_ATTRIBUTES], 
+	int newCharDetails(const uint attribs[TOTAL_ATTRIBUTES],
 		bool allowedClasses[TOTAL_CLASSES], Race race, Sex sex, int classId,
 		int selectedClass, Common::String &msg);
 
diff --git a/engines/xeen/dialogs_query.cpp b/engines/xeen/dialogs_query.cpp
index d8dfea116a..76083a8170 100644
--- a/engines/xeen/dialogs_query.cpp
+++ b/engines/xeen/dialogs_query.cpp
@@ -127,7 +127,7 @@ bool YesNo::execute(bool type, bool townFlag) {
 
 	while (!_vm->shouldQuit()) {
 		events.updateGameCounter();
-		
+
 		if (town.isActive()) {
 			town.drawTownAnim(townFlag);
 			//numFrames = 3;
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp
index 47125c4fa7..f5dfe65b00 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs_spells.cpp
@@ -30,7 +30,7 @@
 
 namespace Xeen {
 
-Character *SpellsDialog::show(XeenEngine *vm, ButtonContainer *priorDialog, 
+Character *SpellsDialog::show(XeenEngine *vm, ButtonContainer *priorDialog,
 		Character *c, int isCasting) {
 	SpellsDialog *dlg = new SpellsDialog(vm);
 	Character *result = dlg->execute(priorDialog, c, isCasting);
@@ -228,7 +228,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 				int spellCost = spells.calcSpellCost(spellId, expenseFactor);
 
 				if (isCasting) {
-					selection = newSelection;					
+					selection = newSelection;
 				} else {
 					Common::String spellName = _spells[newSelection]._name;
 					Common::String msg = (castingCopy & 0x80) ?
@@ -499,7 +499,7 @@ int CastSpell::execute(Character *&c) {
 			int spCost = spells.calcSpellPoints(spellId, c->getCurrentLevel());
 
 			w.writeString(Common::String::format(Res.CAST_SPELL_DETAILS,
-				c->_name.c_str(), spells._spellNames[spellId].c_str(), 
+				c->_name.c_str(), spells._spellNames[spellId].c_str(),
 				spCost, gemCost, c->_currentSp));
 			drawButtons(&screen);
 			w.update();
@@ -586,7 +586,7 @@ Character *SpellOnWho::show(XeenEngine *vm, int spellId) {
 
 	if (result == -1)
 		return nullptr;
-	
+
 	Combat &combat = *vm->_combat;
 	Party &party = *vm->_party;
 	return combat._combatMode == 2 ? combat._combatParty[result] :
@@ -851,7 +851,7 @@ bool LloydsBeacon::execute() {
 			c._lloydMap = party._mazeId;
 			c._lloydPosition = party._mazePosition;
 			c._lloydSide = isDarkCc ? 1 : 0;
-			
+
 			_buttonValue = Common::KEYCODE_ESCAPE;
 			break;
 		}
@@ -959,7 +959,7 @@ int TownPortal::execute() {
 		townNames[3].c_str(), townNames[4].c_str()
 	));
 	w.update();
-	
+
 	// Get the town number
 	int townNumber;
 	Common::String num;
diff --git a/engines/xeen/dialogs_spells.h b/engines/xeen/dialogs_spells.h
index 3ccdb836a3..c1aeadc68d 100644
--- a/engines/xeen/dialogs_spells.h
+++ b/engines/xeen/dialogs_spells.h
@@ -53,7 +53,7 @@ private:
 
 	const char *setSpellText(Character *c, int isCasting);
 public:
-	static Character *show(XeenEngine *vm, ButtonContainer *priorDialog, 
+	static Character *show(XeenEngine *vm, ButtonContainer *priorDialog,
 		Character *c, int isCasting);
 };
 
diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp
index ff4a56fcb0..06dd3d12a7 100644
--- a/engines/xeen/files.cpp
+++ b/engines/xeen/files.cpp
@@ -118,14 +118,14 @@ int BaseCCArchive::listMembers(Common::ArchiveMemberList &list) const {
 
 /*------------------------------------------------------------------------*/
 
-CCArchive::CCArchive(const Common::String &filename, bool encoded): 
+CCArchive::CCArchive(const Common::String &filename, bool encoded):
 		BaseCCArchive(), _filename(filename), _encoded(encoded) {
 	File f(filename);
 	loadIndex(&f);
 }
 
-CCArchive::CCArchive(const Common::String &filename, const Common::String &prefix, 
-		bool encoded): BaseCCArchive(), _filename(filename), 
+CCArchive::CCArchive(const Common::String &filename, const Common::String &prefix,
+		bool encoded): BaseCCArchive(), _filename(filename),
 		_prefix(prefix), _encoded(encoded) {
 	_prefix.toLowercase();
 	File f(filename);
diff --git a/engines/xeen/files.h b/engines/xeen/files.h
index d73eb281c6..ffb703374b 100644
--- a/engines/xeen/files.h
+++ b/engines/xeen/files.h
@@ -32,7 +32,7 @@
 
 namespace Xeen {
 
-enum ArchiveType { 
+enum ArchiveType {
 	ANY_ARCHIVE = -1, GAME_ARCHIVE = 0, ALTSIDE_ARCHIVE = 1,
 	INTRO_ARCHIVE = 2
 };
diff --git a/engines/xeen/font.cpp b/engines/xeen/font.cpp
index 459a334da0..ae2f37fa2d 100644
--- a/engines/xeen/font.cpp
+++ b/engines/xeen/font.cpp
@@ -26,7 +26,7 @@
 
 namespace Xeen {
 
-FontSurface::FontSurface() : XSurface(), _fontData(nullptr), _bgColor(DEFAULT_BG_COLOR), 
+FontSurface::FontSurface() : XSurface(), _fontData(nullptr), _bgColor(DEFAULT_BG_COLOR),
 		_fontReduced(false),_fontJustify(JUSTIFY_NONE), _msgWraps(false) {
 	setTextColor(0);
 }
@@ -60,7 +60,7 @@ const char *FontSurface::writeString(const Common::String &s, const Common::Rect
 	for (;;) {
 		const char *msgStartP = _displayString;
 		_msgWraps = false;
-		
+
 		// Get the size of the string that can be displayed on the line
 		int xp = _fontJustify == JUSTIFY_CENTER ? bounds.left : _writePos.x;
 		while (!getNextCharWidth(xp)) {
@@ -94,7 +94,7 @@ const char *FontSurface::writeString(const Common::String &s, const Common::Rect
 					break;
 				}
 			} else {
-				// Found word break, find end of previous word 
+				// Found word break, find end of previous word
 				while (endP > _displayString && (*endP & 0x7f) == ' ')
 					--endP;
 
@@ -136,7 +136,7 @@ const char *FontSurface::writeString(const Common::String &s, const Common::Rect
 		// Main character display loop
 		while (_displayString <= displayEnd) {
 			char c = getNextChar();
-			
+
 			if (c == ' ') {
 				_writePos.x += _fontReduced ? 3 : 4;
 			} else if (c == '\r') {
@@ -281,7 +281,7 @@ bool FontSurface::newLine(const Common::Rect &bounds) {
 
 	_msgWraps = false;
 	_writePos.x = bounds.left;
-	
+
 	int hv = _fontReduced ? 9 : 10;
 	_writePos.y += hv;
 
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 3c3b572518..d95f613241 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -60,7 +60,7 @@ void PartyDrawer::drawParty(bool updateFlag) {
 		Character &ps = inCombat ? *combat._combatParty[idx] : party._activeParty[idx];
 		Condition charCondition = ps.worstCondition();
 		int charFrame = Res.FACE_CONDITION_FRAMES[charCondition];
-		
+
 		SpriteResource *sprites = (charFrame > 4) ? &_dseFace : ps._faceSprites;
 		if (charFrame > 4)
 			charFrame -= 5;
@@ -130,7 +130,7 @@ void PartyDrawer::resetHighlight() {
 }
 /*------------------------------------------------------------------------*/
 
-Interface::Interface(XeenEngine *vm) : ButtonContainer(vm), InterfaceMap(vm), 
+Interface::Interface(XeenEngine *vm) : ButtonContainer(vm), InterfaceMap(vm),
 		PartyDrawer(vm), _vm(vm) {
 	_buttonsLoaded = false;
 	_intrIndex1 = 0;
@@ -285,7 +285,7 @@ void Interface::perform() {
 		return;
 
 	if (_buttonValue == Common::KEYCODE_SPACE) {
-		int lookupId = map.mazeLookup(party._mazePosition, 
+		int lookupId = map.mazeLookup(party._mazePosition,
 			Res.WALL_SHIFTS[party._mazeDirection][2]);
 
 		bool eventsFlag = true;
@@ -497,7 +497,7 @@ void Interface::perform() {
 
 	case Common::KEYCODE_b:
 		chargeStep();
-		
+
 		if (map.getCell(2) < map.mazeData()._difficulties._wallNoPass
 				&& !map._isOutdoors) {
 			switch (party._mazeDirection) {
@@ -623,7 +623,7 @@ void Interface::stepTime() {
 	Party &party = *_vm->_party;
 	Sound &sound = *_vm->_sound;
 	doStepCode();
-	
+
 	if (++party._ctr24 == 24)
 		party._ctr24 = 0;
 
@@ -652,11 +652,11 @@ void Interface::doStepCode() {
 
 	switch (surfaceId) {
 	case SURFTYPE_SPACE:
-		// Wheeze.. can't breathe in space! Explosive decompression, here we come 
+		// Wheeze.. can't breathe in space! Explosive decompression, here we come
 		party._partyDead = true;
 		break;
 	case SURFTYPE_LAVA:
-		// It burns, it burns! 
+		// It burns, it burns!
 		damage = 100;
 		party._damageType = DT_FIRE;
 		break;
@@ -740,8 +740,8 @@ void Interface::startFalling(bool flag) {
 				map._isOutdoors) {
 			map.getNewMaze();
 		}
-	} 
-	
+	}
+
 	if (isDarkCc) {
 		switch (party._mazeId - 25) {
 		case 0:
@@ -944,7 +944,7 @@ bool Interface::checkMoveDirection(int key) {
 	default:
 		break;
 	}
-	
+
 	map.getCell(7);
 	int startSurfaceId = map._currentSurfaceId;
 	int surfaceId;
@@ -1064,7 +1064,7 @@ void Interface::rest() {
 			for (int idx = 0; idx < 10; ++idx) {
 				chargeStep();
 				draw3d(true);
-				
+
 				if (_vm->_mode == MODE_1) {
 					_vm->_mode = oldMode;
 					return;
@@ -1178,7 +1178,7 @@ void Interface::bash(const Common::Point &pt, Direction direction) {
 	}
 
 	party._activeParty[charNum1 - 1].subtractHitPoints(2);
-	_charPowSprites.draw(screen._windows[0], 0, 
+	_charPowSprites.draw(screen._windows[0], 0,
 		Common::Point(Res.CHAR_FACES_X[charNum1 - 1], 150));
 	screen._windows[0].update();
 
@@ -1246,7 +1246,7 @@ void Interface::draw3d(bool updateFlag, bool skipDelay) {
 	Party &party = *_vm->_party;
 	Screen &screen = *_vm->_screen;
 	Scripts &scripts = *_vm->_scripts;
-	
+
 	if (screen._windows[11]._enabled)
 		return;
 
@@ -1286,7 +1286,7 @@ void Interface::draw3d(bool updateFlag, bool skipDelay) {
 
 	if (combat._attackMonsters[0] != -1 || combat._attackMonsters[1] != -1
 			|| combat._attackMonsters[2] != -1) {
-		if ((_vm->_mode == MODE_1 || _vm->_mode == MODE_SLEEPING) && 
+		if ((_vm->_mode == MODE_1 || _vm->_mode == MODE_SLEEPING) &&
 				!combat._monstersAttacking && !_charsShooting && combat._moveMonsters) {
 			doCombat();
 			if (scripts._eventSkipped)
@@ -1862,7 +1862,7 @@ void Interface::doCombat() {
 	Sound &sound = *_vm->_sound;
 	bool upDoorText = _upDoorText;
 	bool reloadMap = false;
-	
+
 	_upDoorText = false;
 	combat._combatMode = COMBATMODE_2;
 	_vm->_mode = MODE_COMBAT;
@@ -1974,7 +1974,7 @@ void Interface::doCombat() {
 				combat.block();
 				nextChar();
 				break;
-				
+
 			case Common::KEYCODE_c: {
 				// Cast spell
 				int spellId = CastSpell::show(_vm);
@@ -2005,7 +2005,7 @@ void Interface::doCombat() {
 				FightOptions::show(_vm);
 				highlightChar(combat._whosTurn);
 				break;
-			
+
 			case Common::KEYCODE_q:
 				// Quick Reference dialog
 				QuickReferenceDialog::show(_vm);
@@ -2054,7 +2054,7 @@ void Interface::doCombat() {
 			case Common::KEYCODE_RIGHT:
 				// Rotate party direction left or right
 				if (_buttonValue == Common::KEYCODE_LEFT) {
-					party._mazeDirection = (party._mazeDirection == DIR_NORTH) ? 
+					party._mazeDirection = (party._mazeDirection == DIR_NORTH) ?
 						DIR_WEST : (Direction)((int)party._mazeDirection - 1);
 				} else {
 					party._mazeDirection = (party._mazeDirection == DIR_WEST) ?
diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index 0244e3e081..1ada1c6e77 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -27,7 +27,7 @@
 
 namespace Xeen {
 
-OutdoorDrawList::OutdoorDrawList() : _sky1(_data[0]), _sky2(_data[1]), 
+OutdoorDrawList::OutdoorDrawList() : _sky1(_data[0]), _sky2(_data[1]),
 	_groundSprite(_data[2]), _attackImgs1(&_data[124]), _attackImgs2(&_data[95]),
 	_attackImgs3(&_data[76]), _attackImgs4(&_data[53]), _groundTiles(&_data[3]) {
 	_data[0] = DrawStruct(0, 8, 8);
@@ -166,21 +166,21 @@ OutdoorDrawList::OutdoorDrawList() : _sky1(_data[0]), _sky2(_data[1]),
 
 /*------------------------------------------------------------------------*/
 
-IndoorDrawList::IndoorDrawList() : 
+IndoorDrawList::IndoorDrawList() :
 	_sky1(_data[0]), _sky2(_data[1]), _ground(_data[2]), _horizon(_data[28]),
-	_swl_0F1R(_data[146]), _swl_0F1L(_data[144]), _swl_1F1R(_data[134]), 
-	_swl_1F1L(_data[133]), _swl_2F2R(_data[110]), _swl_2F1R(_data[109]), 
-	_swl_2F1L(_data[108]), _swl_2F2L(_data[107]), _swl_3F1R(_data[ 78]), 
+	_swl_0F1R(_data[146]), _swl_0F1L(_data[144]), _swl_1F1R(_data[134]),
+	_swl_1F1L(_data[133]), _swl_2F2R(_data[110]), _swl_2F1R(_data[109]),
+	_swl_2F1L(_data[108]), _swl_2F2L(_data[107]), _swl_3F1R(_data[ 78]),
 	_swl_3F2R(_data[ 77]), _swl_3F3R(_data[ 76]), _swl_3F4R(_data[ 75]),
-	_swl_3F1L(_data[ 74]), _swl_3F2L(_data[ 73]), _swl_3F3L(_data[ 72]), 
-	_swl_3F4L(_data[ 71]), _swl_4F4R(_data[ 33]), _swl_4F3R(_data[ 34]), 
+	_swl_3F1L(_data[ 74]), _swl_3F2L(_data[ 73]), _swl_3F3L(_data[ 72]),
+	_swl_3F4L(_data[ 71]), _swl_4F4R(_data[ 33]), _swl_4F3R(_data[ 34]),
 	_swl_4F2R(_data[ 35]), _swl_4F1R(_data[ 36]), _swl_4F1L(_data[ 32]),
 	_swl_4F2L(_data[ 31]), _swl_4F3L(_data[ 30]), _swl_4F4L(_data[ 29]),
-	_fwl_4F4R(_data[ 45]), _fwl_4F3R(_data[ 44]), _fwl_4F2R(_data[ 43]), 
-	_fwl_4F1R(_data[ 42]), _fwl_4F(  _data[ 41]), _fwl_4F1L(_data[ 40]), 
+	_fwl_4F4R(_data[ 45]), _fwl_4F3R(_data[ 44]), _fwl_4F2R(_data[ 43]),
+	_fwl_4F1R(_data[ 42]), _fwl_4F(  _data[ 41]), _fwl_4F1L(_data[ 40]),
 	_fwl_4F2L(_data[ 39]), _fwl_4F3L(_data[ 38]), _fwl_4F4L(_data[ 37]),
-	_fwl_2F1R(_data[121]), _fwl_2F(  _data[120]), _fwl_2F1L(_data[119]), 
-	_fwl_3F2R(_data[ 91]), _fwl_3F1R(_data[ 90]), _fwl_3F(  _data[ 89]), 
+	_fwl_2F1R(_data[121]), _fwl_2F(  _data[120]), _fwl_2F1L(_data[119]),
+	_fwl_3F2R(_data[ 91]), _fwl_3F1R(_data[ 90]), _fwl_3F(  _data[ 89]),
 	_fwl_3F1L(_data[ 88]), _fwl_3F2L(_data[ 87]), _fwl_1F(  _data[147]),
 	_fwl_1F1R(_data[145]), _fwl_1F1L(_data[143]),
 	_groundTiles(&_data[3]),
@@ -2608,7 +2608,7 @@ void InterfaceMap::setIndoorsMonsters() {
 	}
 }
 
-void InterfaceMap::setMonsterSprite(DrawStruct &drawStruct, MazeMonster &monster, SpriteResource *sprites, 
+void InterfaceMap::setMonsterSprite(DrawStruct &drawStruct, MazeMonster &monster, SpriteResource *sprites,
 		int frame, int defaultY) {
 	MonsterStruct &monsterData = *monster._monsterData;
 	bool flying = monsterData._flying;
@@ -3533,7 +3533,7 @@ void InterfaceMap::drawIndoors() {
 		drawStruct._sprites = sprites.empty() ? (SpriteResource *)nullptr : &sprites;
 
 		surfaceId = map.mazeData()._surfaceTypes[map._currentSurfaceId];
-		if (surfaceId == SURFTYPE_WATER || surfaceId == SURFTYPE_LAVA || 
+		if (surfaceId == SURFTYPE_WATER || surfaceId == SURFTYPE_LAVA ||
 				surfaceId == SURFTYPE_SEWER) {
 			drawStruct._frame = Res.DRAW_FRAMES[cellIndex][_flipWater ? 1 : 0];
 			drawStruct._flags = _flipWater ? SPRFLAG_HORIZ_FLIPPED : 0;
@@ -4343,7 +4343,7 @@ void InterfaceMap::drawIndoors() {
 				_vm->_party->_mazeDirection][_vm->_party->_mazePosition.y]
 			);
 		map.cellFlagLookup(pt);
-		
+
 		_indoorList._sky2._sprites = &map._skySprites[0];
 	} else {
 		_indoorList._sky2._sprites = _indoorList[0]._sprites;
@@ -4362,7 +4362,7 @@ void InterfaceMap::drawIndoors() {
 		if (_vm->_combat->_shooting[idx])
 			_isAttacking = true;
 	}
-	
+
 	_charsShooting = _isAttacking;
 }
 
diff --git a/engines/xeen/interface_map.h b/engines/xeen/interface_map.h
index 2189aacec1..47a7bad963 100644
--- a/engines/xeen/interface_map.h
+++ b/engines/xeen/interface_map.h
@@ -44,9 +44,9 @@ public:
 public:
 	OutdoorDrawList();
 
-	DrawStruct &operator[](int idx) { 
+	DrawStruct &operator[](int idx) {
 		assert(idx < size());
-		return _data[idx]; 
+		return _data[idx];
 	}
 
 	int size() const { return 132; }
@@ -80,9 +80,9 @@ public:
 public:
 	IndoorDrawList();
 
-	DrawStruct &operator[](int idx) { 
+	DrawStruct &operator[](int idx) {
 		assert(idx < size());
-		return _data[idx]; 
+		return _data[idx];
 	}
 
 	int size() const { return 170; }
@@ -99,7 +99,7 @@ private:
 	 * Helper method for setIndoorsMonsters to set a draw structure
 	 * with the deatils for a given monster
 	 */
-	void setMonsterSprite(DrawStruct &drawStruct, MazeMonster &monster, 
+	void setMonsterSprite(DrawStruct &drawStruct, MazeMonster &monster,
 		SpriteResource *sprites, int frame, int defaultY);
 protected:
 	int8 _wp[20];
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index a7be48af8f..f904344206 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -80,13 +80,13 @@ MonsterStruct::MonsterStruct(Common::String name, int experience, int hp, int ac
 		bool flying, int imageNumber, int loopAnimation, int animationEffect,
 		int fx, Common::String attackVoc):
 		_name(name), _experience(experience), _hp(hp), _accuracy(accuracy),
-		_speed(speed), _numberOfAttacks(numberOfAttacks), _hatesClass(hatesClass), 
-		_strikes(strikes), _dmgPerStrike(dmgPerStrike), _attackType(attackType), 
-		_specialAttack(specialAttack), _hitChance(hitChance), _rangeAttack(rangeAttack), 
-		_monsterType(monsterType), _fireResistence(fireResistence), 
+		_speed(speed), _numberOfAttacks(numberOfAttacks), _hatesClass(hatesClass),
+		_strikes(strikes), _dmgPerStrike(dmgPerStrike), _attackType(attackType),
+		_specialAttack(specialAttack), _hitChance(hitChance), _rangeAttack(rangeAttack),
+		_monsterType(monsterType), _fireResistence(fireResistence),
 		_electricityResistence(electricityResistence), _coldResistence(coldResistence),
 		_poisonResistence(poisonResistence), _energyResistence(energyResistence),
-		_magicResistence(magicResistence), _phsyicalResistence(phsyicalResistence), 
+		_magicResistence(magicResistence), _phsyicalResistence(phsyicalResistence),
 		_field29(field29), _gold(gold), _gems(gems), _itemDrop(itemDrop),
 		_flying(flying), _imageNumber(imageNumber), _loopAnimation(loopAnimation),
 		_animationEffect(animationEffect), _fx(fx), _attackVoc(attackVoc) {
@@ -127,7 +127,7 @@ void MonsterStruct::synchronize(Common::SeekableReadStream &s) {
 	_loopAnimation = s.readByte();
 	_animationEffect = s.readByte();
 	_fx = s.readByte();
-	
+
 	char attackVoc[10];
 	s.read(attackVoc, 9);
 	attackVoc[9] = '\0';
@@ -640,7 +640,7 @@ MazeObject::MazeObject() {
 	_direction = DIR_NORTH;
 	_flipped = false;
 	_sprites = nullptr;
-}	
+}
 
 /*------------------------------------------------------------------------*/
 
@@ -1040,7 +1040,7 @@ void Map::load(int mapId) {
 	}
 
 	// TODO: Switch setting flags that don't seem to ever be used
- 
+
 	// Reload the monster data for the main maze that we're loading
 	mapId = _vm->_party->_mazeId;
 	Common::String filename = Common::String::format("maze%c%03d.mob",
@@ -1062,7 +1062,7 @@ void Map::load(int mapId) {
 			filename = "085.obj";
 			_mobData._objectSprites[0]._spriteId = 85;
 		} else {
-			filename = Common::String::format("%03d.%cbj", 
+			filename = Common::String::format("%03d.%cbj",
 				_mobData._objectSprites[i]._spriteId,
 				_mobData._objectSprites[i]._spriteId >= 100 ? '0' : 'o');
 		}
@@ -1074,7 +1074,7 @@ void Map::load(int mapId) {
 
 	// Load sprites for the monsters
 	for (uint i = 0; i < _mobData._monsterSprites.size(); ++i) {
-		ArchiveType archiveType = 
+		ArchiveType archiveType =
 			_mobData._monsterSprites[i]._spriteId == 91 && _vm->getGameID() == GType_WorldOfXeen ?
 			ALTSIDE_ARCHIVE : GAME_ARCHIVE;
 
@@ -1101,7 +1101,7 @@ void Map::load(int mapId) {
 		outdoorList._sky1._sprites = &_skySprites[0];
 		outdoorList._sky2._sprites = &_skySprites[0];
 		outdoorList._groundSprite._sprites = &_groundSprites;
-		
+
 		for (int i = 0; i < TOTAL_SURFACES; ++i) {
 			_wallSprites._surfaces[i].clear();
 
@@ -1195,7 +1195,7 @@ void Map::load(int mapId) {
 
 		indoorList._fwl_1F._sprites = &_wallSprites._fwl1;
 		indoorList._fwl_1F1R._sprites = &_wallSprites._fwl1;
-		indoorList._fwl_1F1L._sprites = &_wallSprites._fwl1;		
+		indoorList._fwl_1F1L._sprites = &_wallSprites._fwl1;
 		indoorList._horizon._sprites = &_wallSprites._fwl1;
 
 		indoorList._ground._sprites = &_groundSprites;
@@ -1384,7 +1384,7 @@ void Map::setCellSurfaceFlags(const Common::Point &pt, int bits) {
 void Map::setWall(const Common::Point &pt, Direction dir, int v) {
 	const int XOR_MASKS[4] = { 0xFFF, 0xF0FF, 0xFF0F, 0xFFF0 };
 	mazeLookup(pt, 0, 0);
-	
+
 	Common::Point mapPos(pt.x & 15, pt.y & 15);
 	MazeWallLayers &wallLayer = _mazeData[_mazeDataIndex]._wallData[mapPos.y][mapPos.x];
 	wallLayer._data &= XOR_MASKS[dir];
@@ -1412,7 +1412,7 @@ int Map::getCell(int idx) {
 		}
 		_currentWall = INVALID_CELL;
 		return INVALID_CELL;
-	} 
+	}
 
 	_mazeDataIndex = 0;
 	while (_mazeData[_mazeDataIndex]._mazeId != mapId)
@@ -1447,7 +1447,7 @@ int Map::getCell(int idx) {
 				_currentWall = INVALID_CELL;
 				return INVALID_CELL;
 			}
-		
+
 			_mazeDataIndex = 0;
 			while (_mazeData[_mazeDataIndex]._mazeId != mapId)
 				++_mazeDataIndex;
@@ -1503,7 +1503,7 @@ int Map::getCell(int idx) {
 			_currentTile = 0;
 		}
 	} else {
-		if (!mapId) 
+		if (!mapId)
 			return 0;
 
 		if (pt.x > 31 || pt.y > 31)
@@ -1523,7 +1523,7 @@ void Map::loadSky() {
 
 	party._isNight = party._minutes < (5 * 60) || party._minutes >= (21 * 60);
 	_skySprites[0].load(((party._mazeId >= 89 && party._mazeId <= 112) ||
-		party._mazeId == 128 || party._mazeId == 129) || !party._isNight 
+		party._mazeId == 128 || party._mazeId == 129) || !party._isNight
 		? "sky.sky" : "night.sky");
 }
 
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index 2c02e6ed2f..d0b63ec146 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -138,7 +138,7 @@ public:
 enum MazeFlags {
 	OUTFLAG_GRATE = 0x80, OUTFLAG_DRAIN = 0x20, OUTFLAG_OBJECT_EXISTS = 0x08,
 	INFLAG_INSIDE = 0x08, FLAG_AUTOEXECUTE_EVENT = 0x10,
-	RESTRICTION_ETHERIALIZE = 0x40, RESTRICTION_80 = 0x80, 
+	RESTRICTION_ETHERIALIZE = 0x40, RESTRICTION_80 = 0x80,
 	RESTRICTION_TOWN_PORTAL = 0x100, RESTRICTION_SUPER_SHELTER = 0x200,
 	RESTRICTION_TIME_DISTORTION = 0x400, RESTRICTION_LLOYDS_BEACON = 0x800,
 	RESTRICTION_TELPORT = 0x1000, RESTRICTION_2000 = 0x2000,
@@ -150,7 +150,7 @@ enum MazeFlags {
 enum MazeFlags2 { FLAG_IS_OUTDOORS = 0x8000, FLAG_IS_DARK = 0x4000 };
 
 enum SurfaceType {
-	SURFTYPE_DEFAULT = 0, 
+	SURFTYPE_DEFAULT = 0,
 	SURFTYPE_WATER = 0, SURFTYPE_DIRT = 1, SURFTYPE_GRASS = 2,
 	SURFTYPE_SNOW = 3, SURFTYPE_SWAMP = 4, SURFTYPE_LAVA = 5,
 	SURFTYPE_DESERT = 6, SURFTYPE_ROAD = 7, SURFTYPE_DWATER = 8,
diff --git a/engines/xeen/music.h b/engines/xeen/music.h
index bf77398885..207ec991a3 100644
--- a/engines/xeen/music.h
+++ b/engines/xeen/music.h
@@ -361,7 +361,7 @@ public:
 	 * Plays a song
 	 */
 	void playSong(const Common::String &name, int param = 0);
-	
+
 	/**
 	 * Plays a song
 	 */
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index 292ac01d2c..abf2c5cfed 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -364,7 +364,7 @@ void Party::changeTime(int numMinutes) {
 		if (player._conditions[PARALYZED] && _vm->getRandomNumber(4) == 1)
 			player._conditions[PARALYZED]--;
 	}
-	
+
 	if (killed)
 		_vm->_interface->drawParty(true);
 
@@ -375,7 +375,7 @@ void Party::changeTime(int numMinutes) {
 void Party::addTime(int numMinutes) {
 	int day = _day;
 	_minutes += numMinutes;
-	
+
 	// If the total minutes has exceeded a day, move to next one
 	while (_minutes >= (24 * 60)) {
 		_minutes -= 24 * 60;
@@ -464,7 +464,7 @@ void Party::handleLight() {
 		}
 	}
 
-	_vm->_interface->_intrIndex1 = _lightCount || 
+	_vm->_interface->_intrIndex1 = _lightCount ||
 		(map.mazeData()._mazeFlags2 & FLAG_IS_DARK) == 0 ? 4 : 0;
 }
 
@@ -599,7 +599,7 @@ void Party::giveTreasure() {
 					// Important item, so clear a slot for it
 					_activeParty[0]._weapons[INV_ITEMS_TOTAL - 1].clear();
 				} else {
-					// Otherwise, clear all the remaining treasure items, 
+					// Otherwise, clear all the remaining treasure items,
 					// since all the party's packs are full
 					for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) {
 						_treasure._weapons[idx].clear();
@@ -657,7 +657,7 @@ void Party::giveTreasure() {
 		while (!events.isKeyMousePressed() && events.timeElapsed() < 1)
 			events.pollEventsAndWait();
 	} while (!_vm->shouldQuit() && events.timeElapsed() == 1);
-	
+
 	if (_vm->_mode != MODE_COMBAT)
 		_vm->_mode = MODE_1;
 
@@ -666,7 +666,7 @@ void Party::giveTreasure() {
 	_gems += _treasure._gems;
 	_treasure._gold = 0;
 	_treasure._gems = 0;
-	
+
 	_treasure._hasItems = false;
 	for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) {
 		_treasure._weapons[idx].clear();
@@ -698,7 +698,7 @@ void Party::giveTreasureToCharacter(Character &c, ItemCategory category, int ite
 	Window &w = screen._windows[10];
 	XeenItem &treasureItem = _treasure._categories[category][itemIndex];
 	sound.playFX(20);
-	
+
 	if (treasureItem._id < 82) {
 		// Copy item into the character's inventory
 		c._items[category][INV_ITEMS_TOTAL - 1] = treasureItem;
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index d753b75801..3febf5bfe1 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -34,7 +34,7 @@
 
 namespace Xeen {
 
-enum Direction { 
+enum Direction {
 	DIR_NORTH = 0, DIR_EAST = 1, DIR_SOUTH = 2, DIR_WEST = 3, DIR_ALL = 4
 };
 
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index b2d8c6d495..4f576835f6 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -87,7 +87,7 @@ const char *const Resources::CREDITS =
 	"\t190Clayton Retzer\n"
 	"\t190David Vela\003""c";
 
-const char *const Resources::OPTIONS_TITLE = 
+const char *const Resources::OPTIONS_TITLE =
 	"\x0D\x01\003""c\014""dMight and Magic Options\n"
 	"World of Xeen\x02\n"
 	"\v117Copyright (c) 1993 NWC, Inc.\n"
@@ -316,13 +316,13 @@ const char *const Resources::SEX_NAMES[2] = { "Male", "Female" };
 
 const char *const Resources::SKILL_NAMES[18] = {
 	"Thievery", "Arms Master", "Astrologer", "Body Builder", "Cartographer",
-	"Crusader", "Direction Sense", "Linguist", "Merchant", "Mountaineer", 
+	"Crusader", "Direction Sense", "Linguist", "Merchant", "Mountaineer",
 	"Navigator", "Path Finder", "Prayer Master", "Prestidigitator",
 	"Swimmer", "Tracker", "Spot Secret Door", "Danger Sense"
 };
 
 const char *const Resources::CLASS_NAMES[11] = {
-	"Knight", "Paladin", "Archer", "Cleric", "Sorcerer", "Robber", 
+	"Knight", "Paladin", "Archer", "Cleric", "Sorcerer", "Robber",
 	"Ninja", "Barbarian", "Druid", "Ranger", nullptr
 };
 
@@ -331,8 +331,8 @@ const uint Resources::CLASS_EXP_LEVELS[10] = {
 };
 
 const char *const Resources::CONDITION_NAMES[17] = {
-	"Cursed", "Heart Broken", "Weak", "Poisoned", "Diseased", 
-	"Insane", "In Love", "Drunk", "Asleep", "Depressed", "Confused", 
+	"Cursed", "Heart Broken", "Weak", "Poisoned", "Diseased",
+	"Insane", "In Love", "Drunk", "Asleep", "Depressed", "Confused",
 	"Paralyzed", "Unconscious", "Dead", "Stone", "Eradicated", "Good"
 };
 
@@ -353,28 +353,28 @@ const char *const Resources::HEROISM = "\n\t020Heroism\t095%+d";
 const char *const Resources::IN_PARTY = "\014""15In Party\014""d";
 
 const char *const Resources::PARTY_DETAILS = "\015\003l\002\014""00"
-	"\013""001""\011""035%s" 
-	"\013""009""\011""035%s" 
-	"\013""017""\011""035%s" 
-	"\013""025""\011""035%s" 
-	"\013""001""\011""136%s" 
-	"\013""009""\011""136%s" 
-	"\013""017""\011""136%s" 
-	"\013""025""\011""136%s" 
-	"\013""044""\011""035%s" 
-	"\013""052""\011""035%s" 
-	"\013""060""\011""035%s" 
-	"\013""068""\011""035%s" 
-	"\013""044""\011""136%s" 
-	"\013""052""\011""136%s" 
-	"\013""060""\011""136%s" 
+	"\013""001""\011""035%s"
+	"\013""009""\011""035%s"
+	"\013""017""\011""035%s"
+	"\013""025""\011""035%s"
+	"\013""001""\011""136%s"
+	"\013""009""\011""136%s"
+	"\013""017""\011""136%s"
+	"\013""025""\011""136%s"
+	"\013""044""\011""035%s"
+	"\013""052""\011""035%s"
+	"\013""060""\011""035%s"
+	"\013""068""\011""035%s"
+	"\013""044""\011""136%s"
+	"\013""052""\011""136%s"
+	"\013""060""\011""136%s"
 	"\013""068""\011""136%s";
 const char *const Resources::PARTY_DIALOG_TEXT =
 	"%s\x2\x3""c\v106\t013Up\t048Down\t083\f37D\fdel\t118\f37R\fdem"
 	"\t153\f37C\fdreate\t188E\f37x\fdit\x1";
 
-const int Resources::FACE_CONDITION_FRAMES[17] = { 
-	2, 2, 2, 1, 1, 4, 4, 4, 3, 2, 4, 3, 3, 5, 6, 7, 0 
+const int Resources::FACE_CONDITION_FRAMES[17] = {
+	2, 2, 2, 1, 1, 4, 4, 4, 3, 2, 4, 3, 3, 5, 6, 7, 0
 };
 
 const int Resources::CHAR_FACES_X[6] = { 10, 45, 81, 117, 153, 189 };
@@ -386,7 +386,7 @@ const char *const Resources::NO_ONE_TO_ADVENTURE_WITH = "You have no one to adve
 const char *const Resources::YOUR_ROSTER_IS_FULL = "Your Roster is full!";
 
 const byte Resources::BACKGROUND_XLAT[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0xF7, 0xFF, 0x09, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0xF9, 0xFF, 0x07, 0x00, 0x00, 0x00,
@@ -409,7 +409,7 @@ const int8 Resources::SCREEN_POSITIONING_X[4][48] = {
 	{
 	-1,  0,  0,  0,  1, -1,  0,  0,  0,  1, -2, -1,
 	-1,  0,  0,  0,  1,  1,  2, -4, -3, -3, -2, -2,
-	-1, -1,  0,  0,  0,  1,  1,  2,  2,  3,  3,  4, 
+	-1, -1,  0,  0,  0,  1,  1,  2,  2,  3,  3,  4,
 	-3, -2, -1,  0,  0,  1,  2,  3, -4,  4,  0,  0
 	}, {
 	 0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  2,
@@ -422,7 +422,7 @@ const int8 Resources::SCREEN_POSITIONING_X[4][48] = {
 	 1,  1,  0,  0,  0, -1, -1, -2, -2, -3, -3, -4,
 	 3,  2,  1,  0,  0, -1, -2, -3,  4, -4,  0,  0
 	}, {
-	 0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -2, -2, 
+	 0,  0,  0,  0,  0, -1, -1, -1, -1, -1, -2, -2,
 	-2, -2, -2, -2, -2, -2, -2, -3, -3, -3, -3, -3,
 	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
 	-4, -4, -4, -4, -4, -4, -4, -4, -4, -4,  0, -1
@@ -513,9 +513,9 @@ const byte Resources::WALL_SHIFTS[4][48] = {
 };
 
 const int Resources::DRAW_NUMBERS[25] = {
-	36, 37, 38, 43, 42, 41, 
-	39, 20, 22, 24, 33, 31, 
-	29, 26, 10, 11, 18, 16, 
+	36, 37, 38, 43, 42, 41,
+	39, 20, 22, 24, 33, 31,
+	29, 26, 10, 11, 18, 16,
 	13, 5, 9, 6, 0, 4, 1
 };
 
@@ -578,8 +578,8 @@ const int Resources::AGE_RANGES_ADJUST[2][10] = {
 };
 
 const uint Resources::STAT_VALUES[24] = {
-	3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 25, 30, 35, 40, 
-	50, 75, 100, 125, 150, 175, 200, 225, 250, 
+	3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 25, 30, 35, 40,
+	50, 75, 100, 125, 150, 175, 200, 225, 250,
 };
 
 const int Resources::STAT_BONUSES[24] = {
@@ -777,7 +777,7 @@ const char *const Resources::TEMPLE_TEXT =
 	"\x03l\x09""000\x0B""090Gold\x03r\x09""000%s"
 	"\x02\x03""c\x0B""122\x09""040ESC\x01";
 
-const char *const Resources::EXPERIENCE_FOR_LEVEL = 
+const char *const Resources::EXPERIENCE_FOR_LEVEL =
 	"%s needs %lu experience for level %u.";
 
 const char *const Resources::LEARNED_ALL = "%s has learned all we can teach!";
@@ -832,7 +832,7 @@ const char *const Resources::BUY_SPELLS =
 	"\x09""012\x0C""37B\x0C""duy Spells\n"
 	"\x09""012\x0C""37S\x0C""dpell Info";
 
-const char *const Resources::GUILD_OPTIONS = 
+const char *const Resources::GUILD_OPTIONS =
 	"\x0D\x0C""00\x03""c\x0B""000\x09""000Guild Options for%s"
 	"\x03l\x09""000\x0B""090Gold"
 	"\x03r\x09""000%s\x02\x03""c\x0B""122\x09""040ESC\x01";
@@ -870,8 +870,8 @@ const int Resources::SPELL_COSTS[77] = {
 };
 
 const int Resources::DARK_SPELL_RANGES[12][2] = {
-	{ 0, 20 }, { 16, 35 }, { 27, 37 }, { 29, 39 }, 
-	{ 0, 17 }, { 14, 34 }, { 26, 37 }, { 29, 39 }, 
+	{ 0, 20 }, { 16, 35 }, { 27, 37 }, { 29, 39 },
+	{ 0, 17 }, { 14, 34 }, { 26, 37 }, { 29, 39 },
 	{ 0, 20 }, { 16, 35 }, { 27, 37 }, { 29, 39 }
 };
 
@@ -948,7 +948,7 @@ const char *const Resources::SPELLS_PRESS_A_KEY =
 
 const char *const Resources::SPELLS_PURCHASE =
 	"\x3l\xB""000\x9""000\xC""d%s  Do you wish to purchase "
-	"\xC""09%s\xC""d for %u?"; 
+	"\xC""09%s\xC""d for %u?";
 
 const char *const Resources::MAP_TEXT =
 	"\x3""c\xB""000\x9""000%s\x3l\xB""139"
@@ -970,7 +970,7 @@ const char *const Resources::LEVITATE_TEXT = "%c%sLevitate%s";
 
 const char *const Resources::WALK_ON_WATER_TEXT = "%c%sWalk on Water";
 
-const char *const Resources::GAME_INFORMATION = 
+const char *const Resources::GAME_INFORMATION =
 	"\xD\x3""c\x9""000\xB""001\xC""37%s of Xeen\xC""d\n"
 	"Game Information\n"
 	"\n"
@@ -1043,7 +1043,7 @@ const char *const Resources::LEVEL_TEXT =
 	"\x3r\x9""054%u\x3l\x9""058/ %u\n"
 	"\x3""c%u Attack%s/Round\x1";
 
-const char *const Resources::RESISTENCES_TEXT = 
+const char *const Resources::RESISTENCES_TEXT =
 	"\x2\x3""c%s\x3l\n"
 	"\x9""020Fire\x9""100%u\n"
 	"\x9""020Cold\x9""100%u\n"
@@ -1072,7 +1072,7 @@ const char *const Resources::FOOD_TEXT =
 
 const char *const Resources::EXCHANGE_WITH_WHOM = "\t010\v005Exchange with whom?";
 
-const char *const Resources::QUICK_REF_LINE = 
+const char *const Resources::QUICK_REF_LINE =
 	"\xB%3d\x9""007%u)\x9""027%s\x9""110%c%c%c\x3r\x9""160\xC%02u%u\xC""d"
 	"\x3l\x9""170\xC%02u%d\xC""d\x9""208\xC%02u%u\xC""d\x9""247\xC"
 	"%02u%u\xC""d\x9""270\xC%02u%c%c%c%c\xC""d";
@@ -1118,11 +1118,11 @@ const char *const Resources::BONUS_NAMES[7] = {
 };
 
 const char *const Resources::WEAPON_NAMES[35] = {
-	nullptr, "long sword ", "short sword ", "broad sword ", "scimitar ", 
-	"cutlass ", "sabre ", "club ", "hand axe ", "katana ", "nunchakas ", 
-	"wakazashi ", "dagger ", "mace ", "flail ", "cudgel ", "maul ", "spear ", 
+	nullptr, "long sword ", "short sword ", "broad sword ", "scimitar ",
+	"cutlass ", "sabre ", "club ", "hand axe ", "katana ", "nunchakas ",
+	"wakazashi ", "dagger ", "mace ", "flail ", "cudgel ", "maul ", "spear ",
 	"bardiche ", "glaive ", "halberd ", "pike ", "flamberge ", "trident ",
-	"staff ", "hammer ", "naginata ", "battle axe ", "grand axe ", "great axe ", 
+	"staff ", "hammer ", "naginata ", "battle axe ", "grand axe ", "great axe ",
 	"short bow ", "long bow ", "crossbow ", "sling ", "Xeen Slayer Sword"
 };
 
@@ -1139,8 +1139,8 @@ const char *const Resources::ACCESSORY_NAMES[11] = {
 
 const char *const Resources::MISC_NAMES[22] = {
 	nullptr, "rod ", "jewel ", "gem ", "box ", "orb ", "horn ", "coin ",
-	"wand ", "whistle ", "potion ", "scroll ", "RogueVM", 
-	"bogusg", "bogus", "bogus", "bogus", "bogus", 
+	"wand ", "whistle ", "potion ", "scroll ", "RogueVM",
+	"bogusg", "bogus", "bogus", "bogus", "bogus",
 	"bogus", "bogus", "bogus", "bogus"
 };
 
@@ -1283,10 +1283,10 @@ const int Resources::ITEM_SKILL_DIVISORS[4] = { 1, 2, 100, 10 };
 const int Resources::RESTRICTION_OFFSETS[4] = { 0, 35, 49, 60 };
 
 const int Resources::ITEM_RESTRICTIONS[86] = {
-	0, 86, 86, 86, 86, 86, 86, 0, 6, 239, 239, 239, 2, 4, 4, 4, 4, 
-	6, 70, 70, 70, 70, 94, 70, 0, 4, 239, 86, 86, 86, 70, 70, 70, 70, 
-	0, 0, 0, 68, 100, 116, 125, 255, 255, 85, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 86, 86, 86, 86, 86, 86, 0, 6, 239, 239, 239, 2, 4, 4, 4, 4,
+	6, 70, 70, 70, 70, 94, 70, 0, 4, 239, 86, 86, 86, 70, 70, 70, 70,
+	0, 0, 0, 68, 100, 116, 125, 255, 255, 85, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
@@ -1326,7 +1326,7 @@ const char *const Resources::WHICH_ITEM = "\t010\v005%s which item?";
 const char *const Resources::WHATS_YOUR_HURRY = "\v007What's your hurry?\n"
 	"Wait till you get out of here!";
 
-const char *const Resources::USE_ITEM_IN_COMBAT = 
+const char *const Resources::USE_ITEM_IN_COMBAT =
 	"\v007To use an item in Combat, invoke the Use command on your turn!";
 
 const char *const Resources::NO_SPECIAL_ABILITIES = "\v005\x3""c%s\fdhas no special abilities!";
@@ -1422,7 +1422,7 @@ const char *const Resources::QUEST_ITEMS_DATA =
 	"\f04 * \fd%s\n"
 	"\f04 * \fd%s\n"
 	"\f04 * \fd%s";
-const char *const Resources::CURRENT_QUESTS_DATA = 
+const char *const Resources::CURRENT_QUESTS_DATA =
 	"\r\x1\fd\x3""c\t000\v000Current Quests\x3l\x2\n"
 	"%s\n"
 	"\n"
@@ -1441,7 +1441,7 @@ const char *const Resources::AUTO_NOTES_DATA =
 	"%s\x3l\n"
 	"%s\x3l";
 
-const char *const Resources::REST_COMPLETE = 
+const char *const Resources::REST_COMPLETE =
 	"\v000\t0008 hours pass.  Rest complete.\n"
 	"%s\n"
 	"%d food consumed.";
@@ -1460,10 +1460,10 @@ const char *const Resources::YOUR_PARTY_IS_FULL = "\v007Your party is full!";
 
 const char *const Resources::HAS_SLAYER_SWORD =
 	"\v000\t000This character has the Xeen Slayer Sword and cannot be deleted!";
-const char *const Resources::SURE_TO_DELETE_CHAR = 
+const char *const Resources::SURE_TO_DELETE_CHAR =
 	"Are you sure you want to delete %s the %s?";
 
-const char *const Resources::CREATE_CHAR_DETAILS = 
+const char *const Resources::CREATE_CHAR_DETAILS =
 	"\f04\x3""c\x2\t144\v119\f37R\f04oll\t144\v149\f37C\f04reate"
 	"\t144\v179\f37ESC\f04\x3l\x1\t195\v021\f37M\f04gt"
 	"\t195\v045\f37I\f04nt\t195\v069\f37P\f04er\t195\v093\f37E\f04nd"
@@ -1514,7 +1514,7 @@ const char *const Resources::COMBAT_DETAILS = "\r\f00\x3""c\v000\t000\x2""Combat
 const char *Resources::NOT_ENOUGH_TO_CAST = "\x3""c\v010Not enough %s to Cast %s";
 const char *Resources::SPELL_CAST_COMPONENTS[2] = { "Spell Points", "Gems" };
 
-const char *const Resources::CAST_SPELL_DETAILS = 
+const char *const Resources::CAST_SPELL_DETAILS =
 	"\r\x2\x3""c\v122\t013\f37C\fdast\t040\f37N\fdew"
 	"\t067ESC\x1\t000\v000\x3""cCast Spell\n"
 	"\n"
@@ -1586,7 +1586,7 @@ const int Resources::TOWN_MAP_NUMBERS[2][5] = {
 	{ 28, 29, 30, 31, 32 }, { 29, 31, 33, 35, 37 }
 };
 
-const char *const Resources::MONSTER_DETAILS = 
+const char *const Resources::MONSTER_DETAILS =
 	"\x3l\n"
 	"%s\x3""c\t100%s\t140%u\t180%u\x3r\t000%s";
 
diff --git a/engines/xeen/saves.cpp b/engines/xeen/saves.cpp
index 9fd2d19a9b..4df4b3727c 100644
--- a/engines/xeen/saves.cpp
+++ b/engines/xeen/saves.cpp
@@ -45,7 +45,7 @@ void OutFile::finalize() {
 
 /*------------------------------------------------------------------------*/
 
-SavesManager::SavesManager(XeenEngine *vm, Party &party) : 
+SavesManager::SavesManager(XeenEngine *vm, Party &party) :
 		BaseCCArchive(), _vm(vm), _party(party) {
 	SearchMan.add("saves", this, 0, false);
 	_data = nullptr;
@@ -82,7 +82,7 @@ void SavesManager::syncBitFlags(Common::Serializer &s, bool *startP, bool *endP)
 Common::SeekableReadStream *SavesManager::createReadStreamForMember(const Common::String &name) const {
 	CCEntry ccEntry;
 
-	// If the given resource has already been perviously "written" to the 
+	// If the given resource has already been perviously "written" to the
 	// save manager, then return that new resource
 	uint16 id = BaseCCArchive::convertNameToId(name);
 	if (_newData.contains(id)) {
diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 32a08b24e5..85c4df5590 100644
--- a/engines/xeen/screen.cpp
+++ b/engines/xeen/screen.cpp
@@ -47,9 +47,9 @@ Window::Window(const Window &src) : XSurface(), _enabled(src._enabled),
 	create(*_vm->_screen, Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
 }
 
-Window::Window(const Common::Rect &bounds, int a, int border, 
+Window::Window(const Common::Rect &bounds, int a, int border,
 		int xLo, int ycL, int xHi, int ycH): XSurface(),
-		_enabled(false), _a(a), _border(border), 
+		_enabled(false), _a(a), _border(border),
 		_xLo(xLo), _ycL(ycL), _xHi(xHi), _ycH(ycH) {
 	setBounds(bounds);
 	create(*_vm->_screen, Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT));
@@ -196,7 +196,7 @@ void Window::drawList(DrawStruct *items, int count) {
 	for (int i = 0; i < count; ++i, ++items) {
 		if (items->_frame == -1 || items->_scale == -1 || items->_sprites == nullptr)
 			continue;
-			
+
 		Common::Point pt(items->_x, items->_y);
 		pt.x += _innerBounds.left;
 		pt.y += _innerBounds.top;
@@ -296,7 +296,7 @@ void Screen::update() {
 }
 
 void Screen::addDirtyRect(const Common::Rect &r) {
-	assert(r.isValidRect() && r.width() > 0 && r.height() > 0 
+	assert(r.isValidRect() && r.width() > 0 && r.height() > 0
 		&& r.left >= 0 && r.top >= 0
 		&& r.right <= SCREEN_WIDTH && r.bottom <= SCREEN_HEIGHT);
 	_dirtyRects.push_back(r);
diff --git a/engines/xeen/screen.h b/engines/xeen/screen.h
index 8df15b22d6..338a231ce6 100644
--- a/engines/xeen/screen.h
+++ b/engines/xeen/screen.h
@@ -96,7 +96,7 @@ public:
 	void frame();
 
 	/**
-	 * Fill the content area of a window with the current background color 
+	 * Fill the content area of a window with the current background color
 	 */
 	void fill();
 
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 1393c6eccf..4e0363120c 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -126,7 +126,7 @@ int Scripts::checkEvents() {
 	Mode oldMode = _vm->_mode;
 	Common::fill(&intf._charFX[0], &intf._charFX[MAX_ACTIVE_PARTY], 0);
 	//int items = _treasureItems;
-	
+
 	if (party._treasure._gold & party._treasure._gems) {
 		// Backup any current treasure data
 		party._savedTreasure = party._treasure;
@@ -162,7 +162,7 @@ int Scripts::checkEvents() {
 			for (eventIndex = 0; eventIndex < map._events.size(); ++eventIndex) {
 				MazeEvent &event = map._events[eventIndex];
 
-				if (event._position == _currentPos && party._mazeDirection != 
+				if (event._position == _currentPos && party._mazeDirection !=
 						(_currentPos.x | _currentPos.y) && event._line == _lineNum) {
 					if (event._direction == party._mazeDirection || event._direction == DIR_ALL) {
 						_vm->_mode = MODE_9;
@@ -366,7 +366,7 @@ void Scripts::cmdDoorTextSml(Common::Array<byte> &params) {
 	Interface &intf = *_vm->_interface;
 
 	Common::String paramText = _vm->_map->_events._text[_event->_parameters[0]];
-	intf._screenText = Common::String::format("\x02\f""08\x03""c\t116\v025%s\x03""l\fd""\x01", 
+	intf._screenText = Common::String::format("\x02\f""08\x03""c\t116\v025%s\x03""l\fd""\x01",
 		paramText.c_str());
 	intf._upDoorText = true;
 	intf.draw3d(true);
@@ -523,7 +523,7 @@ void Scripts::cmdIf(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdMoveObj(Common::Array<byte> &params) { 
+void Scripts::cmdMoveObj(Common::Array<byte> &params) {
 	MazeObject &mazeObj = _vm->_map->_mobData._objects[params[0]];
 
 	if (mazeObj._position.x == params[1] && mazeObj._position.y == params[2]) {
@@ -662,7 +662,7 @@ void Scripts::cmdTakeOrGive(Common::Array<byte> &params) {
 			for (uint idx = 0; idx < party._activeParty.size(); ++idx) {
 				if (_charIndex == 0 || (_charIndex == 8 && (int)idx != _v2)) {
 					party.giveTake(mode1, mask1, mode1, mask2, idx);
-					
+
 					switch (mode1) {
 					case 8:
 						mode1 = 0;
@@ -684,7 +684,7 @@ void Scripts::cmdTakeOrGive(Common::Array<byte> &params) {
 							case 106:
 								if (param2)
 									continue;
-								
+
 								// Break out of character loop
 								idx = party._activeParty.size();
 								break;
@@ -748,7 +748,7 @@ void Scripts::cmdNoAction(Common::Array<byte> &params) {
 	_lineNum = _vm->_party->_partyDead ? -1 : _lineNum + 1;
 }
 
-void Scripts::cmdRemove(Common::Array<byte> &params) { 
+void Scripts::cmdRemove(Common::Array<byte> &params) {
 	Interface &intf = *_vm->_interface;
 	Map &map = *_vm->_map;
 
@@ -761,7 +761,7 @@ void Scripts::cmdRemove(Common::Array<byte> &params) {
 	cmdMakeNothingHere(params);
 }
 
-void Scripts::cmdSetChar(Common::Array<byte> &params) { 
+void Scripts::cmdSetChar(Common::Array<byte> &params) {
 	if (params[0] != 7) {
 		_charIndex = WhoWill::show(_vm, 22, 3, false);
 		if (_charIndex == 0) {
@@ -802,11 +802,11 @@ void Scripts::cmdDoTownEvent(Common::Array<byte> &params) {
 	cmdExit(params);
 }
 
-void Scripts::cmdExit(Common::Array<byte> &params) { 
+void Scripts::cmdExit(Common::Array<byte> &params) {
 	_lineNum = -1;
 }
 
-void Scripts::cmdAlterMap(Common::Array<byte> &params) { 
+void Scripts::cmdAlterMap(Common::Array<byte> &params) {
 	Map &map = *_vm->_map;
 
 	if (params[2] == DIR_ALL) {
@@ -819,7 +819,7 @@ void Scripts::cmdAlterMap(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdGiveExtended(Common::Array<byte> &params) { 
+void Scripts::cmdGiveExtended(Common::Array<byte> &params) {
 	Party &party = *_vm->_party;
 	uint32 mask;
 	int newLineNum;
@@ -862,7 +862,7 @@ void Scripts::cmdGiveExtended(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdConfirmWord(Common::Array<byte> &params) { 
+void Scripts::cmdConfirmWord(Common::Array<byte> &params) {
 	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
 	Common::String msg1 = params[2] ? map._events._text[params[2]] :
@@ -893,7 +893,7 @@ void Scripts::cmdConfirmWord(Common::Array<byte> &params) {
 		}
 		else if (result == 61 && !_vm->_files->_isDarkCc) {
 			doWorldEnd();
-		} else {		
+		} else {
 			if (result == 59 && !_vm->_files->_isDarkCc) {
 				for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) {
 					XeenItem &item = party._treasure._weapons[idx];
@@ -902,7 +902,7 @@ void Scripts::cmdConfirmWord(Common::Array<byte> &params) {
 						item._material = 0;
 						item._bonusFlags = 0;
 						party._treasure._hasItems = true;
-						
+
 						cmdExit(params);
 						return;
 					}
@@ -910,7 +910,7 @@ void Scripts::cmdConfirmWord(Common::Array<byte> &params) {
 			}
 
 			_lineNum = result == -1 ? params[3] : params[1];
-			
+
 			return;
 		}
 	}
@@ -957,7 +957,7 @@ void Scripts::cmdAlterEvent(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdCallEvent(Common::Array<byte> &params) { 
+void Scripts::cmdCallEvent(Common::Array<byte> &params) {
 	_stack.push(StackEntry(_currentPos, _lineNum));
 	_currentPos = Common::Point(params[0], params[1]);
 	_lineNum = params[2] - 1;
@@ -973,7 +973,7 @@ void Scripts::cmdReturn(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdSetVar(Common::Array<byte> &params) { 
+void Scripts::cmdSetVar(Common::Array<byte> &params) {
 	Party &party = *_vm->_party;
 	uint val;
 	_refreshIcons = true;
@@ -1011,7 +1011,7 @@ void Scripts::cmdSetVar(Common::Array<byte> &params) {
 
 void Scripts::cmdCutsceneEndClouds(Common::Array<byte> &params) { error("TODO"); }
 
-void Scripts::cmdWhoWill(Common::Array<byte> &params) { 
+void Scripts::cmdWhoWill(Common::Array<byte> &params) {
 	_charIndex = WhoWill::show(_vm, params[0], params[1], true);
 
 	if (_charIndex == 0)
@@ -1020,7 +1020,7 @@ void Scripts::cmdWhoWill(Common::Array<byte> &params) {
 		cmdNoAction(params);
 }
 
-void Scripts::cmdRndDamage(Common::Array<byte> &params) { 
+void Scripts::cmdRndDamage(Common::Array<byte> &params) {
 	Combat &combat = *_vm->_combat;
 	Interface &intf = *_vm->_interface;
 
@@ -1049,7 +1049,7 @@ void Scripts::cmdAlterCellFlag(Common::Array<byte> &params) {
 		MazeWallLayers &wallData = map.mazeDataCurrent()._wallData[pt.y][pt.x];
 		wallData._data = (wallData._data & 0xFFF0) | params[2];
 	} else {
-		pt.x &= 0xF; 
+		pt.x &= 0xF;
 		pt.y &= 0xF;
 		MazeCell &cell = map.mazeDataCurrent()._cells[pt.y][pt.x];
 		cell._surfaceId = params[2];
@@ -1082,7 +1082,7 @@ void Scripts::cmdDisplayStat(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdSeatTextSml(Common::Array<byte> &params) { 
+void Scripts::cmdSeatTextSml(Common::Array<byte> &params) {
 	Interface &intf = *_vm->_interface;
 
 	intf._screenText = Common::String::format("\x2\f08\x3""c\t116\v090%s\x3l\fd\x1",
@@ -1270,12 +1270,12 @@ void Scripts::cmdFallToMap(Common::Array<byte> &params) {
 	_lineNum = -1;
 }
 
-void Scripts::cmdDisplayMain(Common::Array<byte> &params) { 
+void Scripts::cmdDisplayMain(Common::Array<byte> &params) {
 	display(false, 0);
 	cmdNoAction(params);
 }
 
-void Scripts::cmdGoto(Common::Array<byte> &params) { 
+void Scripts::cmdGoto(Common::Array<byte> &params) {
 	Map &map = *_vm->_map;
 	map.getCell(1);
 	if (params[0] == map._currentSurfaceId)
@@ -1284,12 +1284,12 @@ void Scripts::cmdGoto(Common::Array<byte> &params) {
 	cmdNoAction(params);
 }
 
-void Scripts::cmdGotoRandom(Common::Array<byte> &params) { 
+void Scripts::cmdGotoRandom(Common::Array<byte> &params) {
 	_lineNum = params[_vm->getRandomNumber(1, params[0])] - 1;
 	cmdNoAction(params);
 }
 
-void Scripts::cmdCutsceneEndDarkside(Common::Array<byte> &params) { 
+void Scripts::cmdCutsceneEndDarkside(Common::Array<byte> &params) {
 	Party &party = *_vm->_party;
 	_vm->_saves->_wonDarkSide = true;
 	party._questItems[53] = 1;
@@ -1301,13 +1301,13 @@ void Scripts::cmdCutsceneEndDarkside(Common::Array<byte> &params) {
 	doEndGame2();
 }
 
-void Scripts::cmdCutsceneEdWorld(Common::Array<byte> &params) { 
+void Scripts::cmdCutsceneEdWorld(Common::Array<byte> &params) {
 	_vm->_saves->_wonWorld = true;
 	_vm->_party->_worldEnd = true;
 	doWorldEnd();
 }
 
-void Scripts::cmdFlipWorld(Common::Array<byte> &params) { 
+void Scripts::cmdFlipWorld(Common::Array<byte> &params) {
 	_vm->_map->_loadDarkSide = params[0] != 0;
 }
 
@@ -1342,7 +1342,7 @@ void Scripts::doWorldEnd() {
 
 void Scripts::doEnding(const Common::String &endStr, int v2) {
 	_vm->_saves->saveChars();
-	
+
 	warning("TODO: doEnding");
 }
 
diff --git a/engines/xeen/scripts.h b/engines/xeen/scripts.h
index f41be1b7c6..98f93e7e75 100644
--- a/engines/xeen/scripts.h
+++ b/engines/xeen/scripts.h
@@ -132,7 +132,7 @@ struct MirrorEntry {
 	int _direction;
 
 	MirrorEntry() : _mapId(0), _direction(DIR_ALL) {}
-	
+
 	bool synchronize(Common::SeekableReadStream &s);
 };
 
@@ -174,7 +174,7 @@ private:
 	 * Displays a door text message using the large font
 	 */
 	void cmdDoorTextLrg(Common::Array<byte> &params);
-	
+
 	/**
 	 * Show a sign text on-screen
 	 */
diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp
index 23fb947aef..b3471df96c 100644
--- a/engines/xeen/spells.cpp
+++ b/engines/xeen/spells.cpp
@@ -81,7 +81,7 @@ void Spells::executeSpell(MagicSpell spellId) {
 		&Spells::starBurst, &Spells::stoneToFlesh, &Spells::sunRay,
 		&Spells::superShelter, &Spells::suppressDisease, &Spells::suppressPoison,
 		&Spells::teleport, &Spells::timeDistortion, &Spells::townPortal,
-		&Spells::toxicCloud, &Spells::turnUndead, &Spells::walkOnWater, 
+		&Spells::toxicCloud, &Spells::turnUndead, &Spells::walkOnWater,
 		&Spells::wizardEye
 	};
 
@@ -170,7 +170,7 @@ int Spells::castSpell(Character *c, MagicSpell spellId) {
 	int oldTillMove = intf._tillMove;
 	int result = 1;
 	combat._oldCharacter = c;
-	
+
 	// Try and subtract the SP and gem requirements for the spell
 	int resultError = subSpellCost(*c, spellId);
 	if (resultError) {
@@ -180,7 +180,7 @@ int Spells::castSpell(Character *c, MagicSpell spellId) {
 		// Some spells have special handling
 		switch (spellId) {
 		case MS_EnchantItem:
-		case MS_Etheralize:	
+		case MS_Etheralize:
 		case MS_Jump:
 		case MS_LloydsBeacon:
 		case MS_SuperShelter:
@@ -305,7 +305,7 @@ void Spells::coldRay() {
 	combat.multiAttack(8);
 }
 
-void Spells::createFood() { 
+void Spells::createFood() {
 	Party &party = *_vm->_party;
 	Sound &sound = *_vm->_sound;
 
@@ -451,7 +451,7 @@ void Spells::detectMonster() {
 				if (monster._position == pt) {
 					if (++grid[yDiff][xDiff] > 3)
 						grid[yDiff][xDiff] = 3;
-				
+
 					sprites.draw(w, grid[yDiff][xDiff], Common::Point(xDiff * 9 + 244,
 						yDiff * 7 + 81));
 				}
@@ -806,7 +806,7 @@ void Spells::levitate() {
 	_vm->_sound->playFX(20);
 }
 
-void Spells::light() { 
+void Spells::light() {
 	Interface &intf = *_vm->_interface;
 	Party &party = *_vm->_party;
 	Sound &sound = *_vm->_sound;
@@ -837,7 +837,7 @@ void Spells::lloydsBeacon() {
 	}
 }
 
-void Spells::magicArrow() { 
+void Spells::magicArrow() {
 	Combat &combat = *_vm->_combat;
 	combat._monsterDamage = 0;
 	combat._damageType = DT_MAGIC_ARROW;
@@ -966,7 +966,7 @@ void Spells::protectionFromElements() {
 	Sound &sound = *_vm->_sound;
 	Character &c = *combat._oldCharacter;
 	int resist = MIN(c.getCurrentLevel() * 2 + 5, (uint)200);
-	
+
 	int elementType = SelectElement::show(_vm, MS_ProtFromElements);
 	if (elementType != -1) {
 		switch (elementType) {
@@ -1040,7 +1040,7 @@ void Spells::resurrection() {
 		sound.playFX(30);
 		c->addHitPoints(0);
 		c->_conditions[ERADICATED] = 0;
-		
+
 		if (--c->_endurance._permanent < 1)
 			c->_endurance._permanent = 1;
 		if ((c->_tempAge + 5) >= 250)
@@ -1235,12 +1235,12 @@ void Spells::townPortal() {
 	if (map.mazeData()._mazeFlags & RESTRICTION_TOWN_PORTAL) {
 		spellFailed();
 		return;
-	} 
+	}
 
 	int townNumber = TownPortal::show(_vm);
 	if (!townNumber)
 		return;
-	
+
 	sound.playFX(51);
 	map._loadDarkSide = map._sideTownPortal;
 	_vm->_files->_isDarkCc = map._sideTownPortal > 0;
@@ -1318,7 +1318,7 @@ void Spells::wizardEye() {
 void Spells::frostbite2() {
 	Combat &combat = *_vm->_combat;
 	Sound &sound = *_vm->_sound;
-	
+
 	combat._monsterDamage = 35;
 	combat._damageType = DT_COLD;
 	combat._rangeType = RT_SINGLE;
diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 7327317156..68382abc67 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -54,7 +54,7 @@ SpriteResource::~SpriteResource() {
 SpriteResource &SpriteResource::operator=(const SpriteResource &src) {
 	delete[] _data;
 	_index.clear();
-	
+
 	_filesize = src._filesize;
 	_data = new byte[_filesize];
 	Common::copy(src._data, src._data + _filesize, _data);
@@ -100,9 +100,9 @@ void SpriteResource::clear() {
 	_filesize = 0;
 }
 
-void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt, 
+void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt,
 		const Common::Rect &clipRect, int flags, int scale) {
-	static const uint SCALE_TABLE[] = { 
+	static const uint SCALE_TABLE[] = {
 		0xFFFF, 0xFFEF, 0xEFEF, 0xEFEE, 0xEEEE, 0xEEAE, 0xAEAE, 0xAEAA,
 		0xAAAA, 0xAA8A, 0x8A8A, 0x8A88, 0x8888, 0x8880, 0x8080, 0x8000
 	};
@@ -126,9 +126,9 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 	Common::Point destPos;
 	destPos.x = pt.x + getScaledVal(xOffset, scaleMaskX);
 	destPos.x += (width - getScaledVal(width, scaleMaskX)) / 2;
-	
+
 	destPos.y = pt.y + getScaledVal(yOffset, scaleMaskY);
-	
+
 	// If the flags allow the dest surface to be resized, ensure dest surface is big enough
 	Common::Rect bounds = clipRect;
 	if (flags & SPRFLAG_RESIZE) {
@@ -136,7 +136,7 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 			dest.create(xOffset + width, yOffset + height);
 		bounds = Common::Rect(0, 0, dest.w, dest.h);
 	}
-	
+
 	uint16 scaleMaskXCopy = scaleMaskX;
 	Common::Rect drawBounds;
 	drawBounds.left = SCREEN_WIDTH;
@@ -156,10 +156,10 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 			continue;
 		}
 
-		// Roll the scale mask 
+		// Roll the scale mask
 		uint bit = (scaleMaskY >> 15) & 1;
 		scaleMaskY = ((scaleMaskY & 0x7fff) << 1) + bit;
-		
+
 		if (!bit) {
 			// Not a line to be drawn due to scaling down
 			f.skip(lineLength);
@@ -170,7 +170,7 @@ void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Poi
 		} else {
 			scaleMaskX = scaleMaskXCopy;
 			xOffset = f.readByte();
-			
+
 			// Initialize the array to hold the temporary data for the line. We do this to make it simpler
 			// to handle both deciding which pixels to draw in a scaled image, as well as when images
 			// have been horizontally flipped. Note that we allocate an extra line for before and after our
@@ -308,7 +308,7 @@ void SpriteResource::draw(Window &dest, int frame, const Common::Point &destPos,
 	draw(dest, frame, destPos, dest.getBounds(), flags, scale);
 }
 
-void SpriteResource::draw(XSurface &dest, int frame, const Common::Point &destPos, 
+void SpriteResource::draw(XSurface &dest, int frame, const Common::Point &destPos,
 		const Common::Rect &bounds, int flags, int scale) {
 
 	drawOffset(dest, _index[frame]._offset1, destPos, bounds, flags, scale);
@@ -330,7 +330,7 @@ uint SpriteResource::getScaledVal(int xy, uint16 &scaleMask) {
 		scaleMask = ((scaleMask & 0x7fff) << 1) + bit;
 		result += bit;
 	}
-	
+
 	return result;
 }
 
diff --git a/engines/xeen/sprites.h b/engines/xeen/sprites.h
index 17c745f26e..b61ec83cd6 100644
--- a/engines/xeen/sprites.h
+++ b/engines/xeen/sprites.h
@@ -66,7 +66,7 @@ private:
 	/**
 	 * Draw a sprite frame based on a passed offset into the data stream
 	 */
-	void drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt, 
+	void drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt,
 		const Common::Rect &clipRect, int flags, int scale);
 
 	/**
@@ -99,7 +99,7 @@ public:
 	 */
 	void clear();
 
-	void draw(XSurface &dest, int frame, const Common::Point &destPos, 
+	void draw(XSurface &dest, int frame, const Common::Point &destPos,
 		int flags = 0, int scale = 0);
 
 	void draw(Window &dest, int frame, const Common::Point &destPos,
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp
index c0ecf5cf6f..13a631aa47 100644
--- a/engines/xeen/town.cpp
+++ b/engines/xeen/town.cpp
@@ -104,7 +104,7 @@ int Town::townAction(int actionId) {
 		sound.stopSound();
 		vocName = isDarkCc ? "bank1.voc" : "banker.voc";
 		break;
-	
+
 	case 1:
 		// Blacksmith
 		_icons1.load("esc.icn");
@@ -215,7 +215,7 @@ int Town::townAction(int actionId) {
 	Character *charP = &party._activeParty[0];
 	Common::String title = createTownText(*charP);
 	intf._face1UIFrame = intf._face2UIFrame = 0;
-	intf._dangerSenseUIFrame = 0; 
+	intf._dangerSenseUIFrame = 0;
 	intf._spotDoorsUIFrame = 0;
 	intf._levitateUIFrame = 0;
 
@@ -525,7 +525,7 @@ Character *Town::doBankOptions(Character *c) {
 Character *Town::doBlacksmithOptions(Character *c) {
 	Interface &intf = *_vm->_interface;
 	Party &party = *_vm->_party;
-	
+
 	if (_buttonValue >= Common::KEYCODE_F1 && _buttonValue <= Common::KEYCODE_F6) {
 		// Switch character
 		_buttonValue -= Common::KEYCODE_F1;
@@ -782,7 +782,7 @@ Character *Town::doTempleOptions(Character *c) {
 	Interface &intf = *_vm->_interface;
 	Party &party = *_vm->_party;
 	Sound &sound = *_vm->_sound;
-	
+
 	switch (_buttonValue) {
 	case Common::KEYCODE_F1:
 	case Common::KEYCODE_F2:
@@ -808,7 +808,7 @@ Character *Town::doTempleOptions(Character *c) {
 			if (_dayOfWeek == (party._day / 10)) {
 				party._clairvoyanceActive = true;
 				party._lightCount = 1;
-				
+
 				int amt = _dayOfWeek ? _dayOfWeek : 10;
 				party._heroism = amt;
 				party._holyBonus = amt;
@@ -916,7 +916,7 @@ Character *Town::doTrainingOptions(Character *c) {
 				sound.stopSound();
 				sound.playSound(isDarkCc ? "prtygd.voc" : "trainin2.voc", 1);
 
-				c->_experience -=  c->nextExperienceLevel() - 
+				c->_experience -=  c->nextExperienceLevel() -
 					(c->getCurrentExperience() - c->_experience);
 				c->_level._permanent++;
 
@@ -987,7 +987,7 @@ void Town::depositWithdrawl(int choice) {
 		default:
 			continue;
 		}
-		
+
 		if ((choice && !party._bankGems && flag) ||
 			(choice && !party._bankGold && !flag) ||
 			(!choice && !party._gems && flag) ||
@@ -1261,7 +1261,7 @@ bool TownMessage::execute(int portrait, const Common::String &name, const Common
 				break;
 
 			if (!msgEnd) {
-				if (confirm || _buttonValue == Common::KEYCODE_ESCAPE || 
+				if (confirm || _buttonValue == Common::KEYCODE_ESCAPE ||
 						_buttonValue == Common::KEYCODE_n)
 					result = 0;
 				else if (_buttonValue == Common::KEYCODE_y)
diff --git a/engines/xeen/town.h b/engines/xeen/town.h
index 0767638f8a..25faa38c76 100644
--- a/engines/xeen/town.h
+++ b/engines/xeen/town.h
@@ -117,7 +117,7 @@ private:
 
 	TownMessage(XeenEngine *vm) : ButtonContainer(vm) {}
 
-	bool execute(int portrait, const Common::String &name, 
+	bool execute(int portrait, const Common::String &name,
 		const Common::String &text, int confirm);
 
 	void loadButtons();
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index fc7c99d407..32209a766b 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -154,7 +154,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 				lake3.draw(screen, lakeCtr, Common::Point(0, yCtr));
 			}
 		}
-		
+
 		xeen.draw(screen, 0);
 		screen.update();
 		WAIT(1);
@@ -218,7 +218,7 @@ bool CloudsCutscenes::showCloudsIntro() {
 	groupo.draw(screen, 1, Common::Point(160, 0));
 	crodo.draw(screen, 0, Common::Point(0, -5));
 	screen._windows[0].writeString(Res.CLOUDS_INTRO1);
-	
+
 	// Unroll a scroll
 	if (doScroll(false, true))
 		return false;
@@ -273,10 +273,10 @@ bool CloudsCutscenes::showCloudsIntro() {
 			}
 
 			group.draw(screen, ctr4 + 5, Common::Point(0, 99));
-			group.draw(screen, ctr2 + 24, Common::Point(202, 12));			
+			group.draw(screen, ctr2 + 24, Common::Point(202, 12));
 			if ((++totalCtr % 30) == 0)
 				group.draw(screen, 43, Common::Point(178, 134));
-		
+
 			switch (lineCtr) {
 			case 2:
 			case 4:
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index e40fee680f..9aad9b1d18 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -135,7 +135,7 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 	screen.loadBackground("jvc.raw");
 	screen.draw();
 	screen.fadeIn();
-	
+
 	WAIT(60);
 	return true;
 }
@@ -262,7 +262,7 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 	title.clear();
 	pyraTop.clear();
 	pyramid.clear();
-	
+
 	//
 	SpriteResource dragon("dragon.int");
 	const int XLIST3[10] = { 102, 103, 104, 104, 104, 103, 102, 101, 101, 101 };
@@ -574,7 +574,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 		sc08.draw(screen, 0);
 		showSubtitles();
 	} while (_subtitleSize);
-		
+
 	sc08.clear();
 
 	// Nowhere to run to
@@ -600,7 +600,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 		screen.restoreBackground();
 		showSubtitles();
 	} while (_subtitleSize);
-	
+
 	sc09.clear();
 
 	// Nor do you!
@@ -760,7 +760,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 	screen.loadBackground("sc170001.raw");
 	screen.saveBackground();
 	screen.horizMerge(0);
-	sc16.draw(screen, 0, Common::Point(7, 29));	
+	sc16.draw(screen, 0, Common::Point(7, 29));
 	showSubtitles();
 	sound.playSound("fail1.voc");
 
@@ -834,7 +834,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 
 	for (int idx = 0; idx < 4; ++idx)
 		sc18[idx].clear();
-	
+
 	// Closeup of Corak bleeding
 	SpriteResource sc19("sc19.end");
 	screen.loadBackground("sc190001.raw");
@@ -1013,7 +1013,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 	screen.saveBackground();
 	sc25.draw(screen, 0, Common::Point(27, 30));
 	screen.update();
-	
+
 	for (int struggleNum = 0; struggleNum < 2; ++struggleNum) {
 		for (int idx = 0; idx < 9; ++idx) {
 			if (struggleNum == 0 && idx == 2)
@@ -1220,7 +1220,7 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c
 
 			idx = (idx + 1) % 32;
 			screen.update();
-			
+
 			events.pollEventsAndWait();
 		} while (!_vm->shouldQuit() && !events.isKeyMousePressed());
 
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index f4d8fdbc94..93a0005088 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -30,7 +30,7 @@ namespace Xeen {
 namespace WorldOfXeen {
 
 WorldOfXeenEngine::WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc)
-		: XeenEngine(syst, gameDesc), CloudsCutscenes(this), 
+		: XeenEngine(syst, gameDesc), CloudsCutscenes(this),
 		DarkSideCutscenes(this) {
 	_seenDarkSideIntro = false;
 }
diff --git a/engines/xeen/worldofxeen/worldofxeen.h b/engines/xeen/worldofxeen/worldofxeen.h
index 41fe4b3b83..7dbb710430 100644
--- a/engines/xeen/worldofxeen/worldofxeen.h
+++ b/engines/xeen/worldofxeen/worldofxeen.h
@@ -36,11 +36,11 @@ enum WOXGameAction {
 };
 
 /**
- * Implements a descendant of the base Xeen engine to handle 
+ * Implements a descendant of the base Xeen engine to handle
  * Clouds of Xeen, Dark Side of Xeen, and Worlds of Xeen specific
  * game code
  */
-class WorldOfXeenEngine: public XeenEngine, public CloudsCutscenes, 
+class WorldOfXeenEngine: public XeenEngine, public CloudsCutscenes,
 		public DarkSideCutscenes {
 protected:
 	/**
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index d3f273784b..ff73cab4bb 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -53,7 +53,7 @@ void WorldOfXeenMenu::execute() {
 	SpriteResource special("special.icn");
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
-	
+
 	File newBright("newbrigh.m");
 	_vm->_sound->playSong(newBright);
 
@@ -210,7 +210,7 @@ void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 	events.updateGameCounter();
-	
+
 	// Draw the background frame in a continous cycle
 	_bgFrame = (_bgFrame + 1) % 5;
 	title1.draw(screen._windows[0], _bgFrame);
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.h b/engines/xeen/worldofxeen/worldofxeen_menu.h
index 9b507b7ed1..49553dd10f 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.h
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.h
@@ -87,7 +87,7 @@ protected:
 	virtual void showContents(SpriteResource &title1, bool mode);
 public:
 	WorldOptionsMenu(XeenEngine *vm) : DarkSideOptionsMenu(vm), _bgFrame(0) {}
-	
+
 	virtual ~WorldOptionsMenu() {}
 };
 
diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp
index 1d23546551..412cd456ef 100644
--- a/engines/zvision/video/zork_avi_decoder.cpp
+++ b/engines/zvision/video/zork_avi_decoder.cpp
@@ -50,7 +50,7 @@ void ZorkAVIDecoder::ZorkAVIAudioTrack::createAudioStream() {
 	_audioStream = _queueStream;
 }
 
-void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *stream) {			
+void ZorkAVIDecoder::ZorkAVIAudioTrack::queueSound(Common::SeekableReadStream *stream) {
 	RawChunkStream::RawChunk chunk = _decoder.readNextChunk(stream);
 	delete stream;