diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index c17b611b0c34..0793d9721549 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -1513,8 +1513,8 @@ int RMPointer::curAction() {
 	return _nCurPointer;
 }
 
-/** 
- * Show the cursor 
+/**
+ * Show the cursor
  */
 void RMPointer::showCursor() {
 	if (!CursorMan.isVisible()) {
@@ -1524,8 +1524,8 @@ void RMPointer::showCursor() {
 	}
 }
 
-/** 
- * Hide the cursor 
+/**
+ * Hide the cursor
  */
 void RMPointer::hideCursor() {
 	if (CursorMan.isVisible()) {
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp
index 772d3da075d1..ef58208d3fe9 100644
--- a/engines/tony/mpal/expr.cpp
+++ b/engines/tony/mpal/expr.cpp
@@ -88,7 +88,7 @@ typedef struct {
 	byte type;						// Tipo di oggetto (vedi enum ExprListTypes)
 	byte unary;						// Unary operatore (NON SUPPORTATO)
 
-	union { 
+	union {
 		int num;                    // Numero (se type==ELT_NUMBER)
 		char *name;                 // Nome variabile (se type==ELT_VAR)
 		HGLOBAL son;                // Handle a espressione (type==ELT_PARENTH)
@@ -179,7 +179,7 @@ static int Compute(int a, int b, byte symbol) {
 		GLOBALS._mpalError = 1;
 		break;
 	}
- 
+
 	return 0;
 }
 
@@ -211,7 +211,7 @@ static void solve(LPEXPRESSION one, int num) {
 
 
 /**
- * Calculates the result of a mathematical expression, replacing the current 
+ * Calculates the result of a mathematical expression, replacing the current
  * value of any variable.
  *
  * @param expr				Pointer to an expression duplicated by DuplicateExpression
@@ -253,7 +253,7 @@ static int evaluateAndFreeExpression(byte *expr) {
  * Parses a mathematical expression from the MPC file
  *
  * @param buf				Buffer containing the expression to evaluate
- * @param h					Pointer to a handle that, at the end of execution, 
+ * @param h					Pointer to a handle that, at the end of execution,
  * will point to the area of memory containing the parsed expression
  * @returns		Pointer to the buffer immediately after the expression, or NULL if error.
  */
@@ -377,7 +377,7 @@ bool compareExpressions(HGLOBAL h1, HGLOBAL h2) {
 				return false;
 			}
 			break;
-		 
+
 		case ELT_VAR:
 			if (strcmp(one->val.name, two->val.name) != 0) {
 				globalUnlock(h1);
@@ -385,7 +385,7 @@ bool compareExpressions(HGLOBAL h1, HGLOBAL h2) {
 				return false;
 			}
 			break;
-	
+
 		case ELT_PARENTH:
 			if (!compareExpressions(one->val.son, two->val.son)) {
 				globalUnlock(h1);
@@ -395,13 +395,13 @@ bool compareExpressions(HGLOBAL h1, HGLOBAL h2) {
 			break;
 		}
 
-		++one; 
+		++one;
 		++two;
 	}
 
 	globalUnlock(h1);
 	globalUnlock(h2);
- 
+
 	return true;
 }
 
diff --git a/engines/tony/mpal/expr.h b/engines/tony/mpal/expr.h
index 3130539000ca..f9c8a7c48f15 100644
--- a/engines/tony/mpal/expr.h
+++ b/engines/tony/mpal/expr.h
@@ -43,7 +43,7 @@ namespace MPAL {
  * Parses a mathematical expression from the MPC file
  *
  * @param buf				Buffer containing the expression to evaluate
- * @param h					Pointer to a handle that, at the end of execution, 
+ * @param h					Pointer to a handle that, at the end of execution,
  * will point to the area of memory containing the parsed expression
  * @returns		Pointer to the buffer immediately after the expression, or NULL if error.
  */
diff --git a/engines/tony/mpal/loadmpc.cpp b/engines/tony/mpal/loadmpc.cpp
index 2d2f8ecd00e4..9da2cc121e3c 100644
--- a/engines/tony/mpal/loadmpc.cpp
+++ b/engines/tony/mpal/loadmpc.cpp
@@ -157,7 +157,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 	/* Periodi */
 	num = READ_LE_UINT16(lpBuf);
 	lpBuf += 2;
-	
+
 	if (num >= MAX_PERIODS_PER_DIALOG - 1)
 		error("Too much periods in dialog #%d", lpmdDialog->nObj);
 
@@ -252,7 +252,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 				}
 			}
 
-			if (kk == curCmd) {	
+			if (kk == curCmd) {
 				lpmdDialog->_group[i].CmdNum[j] = curCmd;
 				curCmd++;
 			}
@@ -445,7 +445,7 @@ static const byte *parseItem(const byte *lpBuf, LPMPALITEM lpmiItem) {
 				}
 			}
 
-			if (kk == curCmd) {	
+			if (kk == curCmd) {
 				lpmiItem->Action[i].CmdNum[j] = curCmd;
 				curCmd++;
 
@@ -520,7 +520,7 @@ static const byte *ParseLocation(const byte *lpBuf, LPMPALLOCATION lpmlLocation)
 //@{
 
 /**
- * Reads and interprets the MPC file, and create structures for various directives 
+ * Reads and interprets the MPC file, and create structures for various directives
  * in the global variables
  *
  * @param lpBuf				Buffer containing the MPC file data, excluding the header.
diff --git a/engines/tony/mpal/loadmpc.h b/engines/tony/mpal/loadmpc.h
index b805b1e7a18a..c0e2ca7fb567 100644
--- a/engines/tony/mpal/loadmpc.h
+++ b/engines/tony/mpal/loadmpc.h
@@ -38,7 +38,7 @@ namespace MPAL {
 \****************************************************************************/
 
 /**
- * Reads and interprets the MPC file, and create structures for various directives 
+ * Reads and interprets the MPC file, and create structures for various directives
  * in the global variables
  *
  * @param lpBuf				Buffer containing the MPC file data, excluding the header.
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 721552b80cfe..be2f6db43f7a 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -31,7 +31,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "tony/tony.h"
-#include "tony/mpal/lzo.h"	
+#include "tony/mpal/lzo.h"
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/mpaldll.h"
 
@@ -358,7 +358,7 @@ static char *duplicateDialogPeriod(uint32 nPeriod) {
 			return clonemsg;
 		}
 	}
-	
+
 	return NULL;
 }
 
@@ -551,7 +551,7 @@ static LPITEM getItemData(uint32 nOrdItem) {
 		dim = (uint32)(ret->_frameslocations[i].right - ret->_frameslocations[i].left) *
 			(uint32)(ret->_frameslocations[i].bottom - ret->_frameslocations[i].top);
 		ret->_frames[i] = (char *)globalAlloc(GMEM_FIXED,dim);
-   
+
 		if (ret->_frames[i] == NULL)
 			return NULL;
 		memcpy(ret->_frames[i], dat, dim);
@@ -570,7 +570,7 @@ static LPITEM getItemData(uint32 nOrdItem) {
 }
 
 
-/** 
+/**
  * Thread that calls a custom function. It is used in scripts, so that each script
  * function is executed without delaying the others.
  *
@@ -685,7 +685,7 @@ void ScriptThread(CORO_PARAM, const void *param) {
 
 
 /**
- * Thread that performs an action on an item. the thread always executes the action, 
+ * Thread that performs an action on an item. the thread always executes the action,
  * so it should create a new item in which the action is the one required.
  * Furthermore, the expression is not checked, but it is always performed the action.
  *
@@ -745,7 +745,7 @@ void ActionThread(CORO_PARAM, const void *param) {
 
 	globalDestroy(_ctx->item);
 	_ctx->item = NULL;
-	
+
 	debugC(DEBUG_DETAILED, kTonyDebugActions, "Action Process %d ended", CoroScheduler.getCurrentPID());
 
 	CORO_END_CODE;
@@ -855,7 +855,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 		if (_ctx->ord == -1)
 			continue;
-	 
+
 		_ctx->curItem = GLOBALS._lpmiItems + _ctx->ord;
 
 		_ctx->k = 0;
@@ -1005,7 +1005,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 					if (_ctx->newItem == false) {
 						globalDestroy(_ctx->MyThreads);
 						globalDestroy(_ctx->MyActions);
-						
+
 						CORO_KILL_SELF();
 						return;
 					}
@@ -1032,7 +1032,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 						globalDestroy(_ctx->newItem);
 						globalDestroy(_ctx->MyThreads);
 						globalDestroy(_ctx->MyActions);
-						
+
 						CORO_KILL_SELF();
 						return;
 					}
@@ -1068,10 +1068,10 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 
 /**
- * Wait for the end of the dialog execution thread, and then restore global 
+ * Wait for the end of the dialog execution thread, and then restore global
  * variables indicating that the dialogue has finished.
  *
- * @param param				Pointer to a handle to the dialog 
+ * @param param				Pointer to a handle to the dialog
  * @remarks		This additional process is used, instead of clearing variables
  * within the same dialog thread, because due to the recursive nature of a dialog,
  * it would be difficult to know within it when the dialog is actually ending.
@@ -1132,9 +1132,9 @@ void GroupThread(CORO_PARAM, const void *param) {
 				if (_ctx->type == 1) {
 					// Call custom function
 					CORO_INVOKE_4(GLOBALS._lplpFunctions[_ctx->dialog->_command[_ctx->k]._nCf],
-						_ctx->dialog->_command[_ctx->k]._arg1, 
+						_ctx->dialog->_command[_ctx->k]._arg1,
 						_ctx->dialog->_command[_ctx->k]._arg2,
-						_ctx->dialog->_command[_ctx->k]._arg3, 
+						_ctx->dialog->_command[_ctx->k]._arg3,
 						_ctx->dialog->_command[_ctx->k]._arg4
 					);
 
@@ -1143,22 +1143,22 @@ void GroupThread(CORO_PARAM, const void *param) {
 					lockVar();
 					varSetValue(_ctx->dialog->_command[_ctx->k].lpszVarName, evaluateExpression(_ctx->dialog->_command[_ctx->k].expr));
 					unlockVar();
-					
+
 				} else if (_ctx->type == 3) {
 					// DoChoice: call the chosen function
 					CORO_INVOKE_1(doChoice, (uint32)_ctx->dialog->_command[_ctx->k].nChoice);
-					
+
 				} else {
 					GLOBALS._mpalError = 1;
 					unlockDialogs();
-					
+
 					CORO_KILL_SELF();
 					return;
 				}
 			}
 
 			/* The gruop is finished, so we can return to the calling function.
-			 * If the group was the first called, then the process will automatically 
+			 * If the group was the first called, then the process will automatically
 			 * end. Otherwise it returns to the caller method
 			 */
 			return;
@@ -1168,7 +1168,7 @@ void GroupThread(CORO_PARAM, const void *param) {
 	/* If we are here, it means that we have not found the requested group */
 	GLOBALS._mpalError = 1;
 	unlockDialogs();
-	
+
 	CORO_KILL_SELF();
 
 	CORO_END_CODE;
@@ -1259,7 +1259,7 @@ void doChoice(CORO_PARAM, uint32 nChoice) {
 		if (_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].attr & (1 << 1)) {
 			/* Bit 1 set: the end of the dialog */
 			unlockDialogs();
-			
+
 			CORO_KILL_SELF();
 			return;
 		}
@@ -1348,8 +1348,8 @@ static uint32 doAction(uint32 nAction, uint32 ordItem, uint32 dwParam) {
  * @param nGroup				Number of the group to perform
  * @returns						The process Id of the process running the dialog
  *								or CORO_INVALID_PID_VALUE on error
- * @remarks						The dialogue runs in a thread created on purpose, 
- * so that must inform through an event and when 'necessary to you make a choice. 
+ * @remarks						The dialogue runs in a thread created on purpose,
+ * so that must inform through an event and when 'necessary to you make a choice.
  * The data on the choices may be obtained through various queries.
  */
 static uint32 doDialog(uint32 nDlgOrd, uint32 nGroup) {
@@ -1382,7 +1382,7 @@ static uint32 doDialog(uint32 nDlgOrd, uint32 nGroup) {
 
 
 /**
- * Takes note of the selection chosen by the user, and warns the process that was running 
+ * Takes note of the selection chosen by the user, and warns the process that was running
  * the box that it can continue.
  *
  * @param nChoice           Number of choice that was in progress
@@ -1420,7 +1420,7 @@ bool doSelection(uint32 i, uint32 dwData) {
  * @param lplpcfArray		Array of pointers to custom functions.
  * @returns		True if everything is OK, false on failure
  */
-bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName, 
+bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 			  LPLPCUSTOMFUNCTION lplpcfArray, Common::String *lpcfStrings) {
 	Common::File hMpc;
 	byte buf[5];
@@ -1620,7 +1620,7 @@ uint32 mpalQueryDWORD(uint16 wQueryType, ...) {
 		 */
 		error("mpalQuery(MPQ_MESSAGE, uint32 nMsg) used incorrect method variant");
 
-		
+
 	} else if (wQueryType == MPQ_ITEM_PATTERN) {
 		/*
 		 *  uint32 mpalQuery(MPQ_ITEM_PATTERN, uint32 nItem);
@@ -1629,7 +1629,7 @@ uint32 mpalQueryDWORD(uint16 wQueryType, ...) {
 		buf = Common::String::format("Pattern.%u", GETARG(uint32));
 		dwRet = (uint32)varGetValue(buf.c_str());
 		unlockVar();
-		
+
 	} else if (wQueryType == MPQ_LOCATION_SIZE) {
 		/*
 		 *  uint32 mpalQuery(MPQ_LOCATION_SIZE, uint32 nLoc, uint32 dwCoord);
@@ -1648,7 +1648,7 @@ uint32 mpalQueryDWORD(uint16 wQueryType, ...) {
 			GLOBALS._mpalError = 1;
 
 		unlockLocations();
-		
+
 	} else if (wQueryType == MPQ_LOCATION_IMAGE) {
 		/*
 		 *  HGLOBAL mpalQuery(MPQ_LOCATION_IMAGE, uint32 nLoc);
@@ -1815,19 +1815,19 @@ HANDLE mpalQueryHANDLE(uint16 wQueryType, ...) {
 		LockMsg();
 		hRet = DuplicateMessage(msgGetOrderFromNum(GETARG(uint32)));
 		UnlockMsg();
-		
+
 	} else if (wQueryType == MPQ_ITEM_PATTERN) {
 		/*
 		 *  uint32 mpalQuery(MPQ_ITEM_PATTERN, uint32 nItem);
 		 */
 		error("mpalQuery(MPQ_ITEM_PATTERN, uint32 nItem) used incorrect variant");
-		
+
 	} else if (wQueryType == MPQ_LOCATION_SIZE) {
 		/*
 		 *  uint32 mpalQuery(MPQ_LOCATION_SIZE, uint32 nLoc, uint32 dwCoord);
 		 */
 		error("mpalQuery(MPQ_LOCATION_SIZE, uint32 nLoc, uint32 dwCoord) used incorrect variant");
-		
+
 	} else if (wQueryType == MPQ_LOCATION_IMAGE) {
 		/*
 		 *  HGLOBAL mpalQuery(MPQ_LOCATION_IMAGE, uint32 nLoc);
@@ -1961,9 +1961,9 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) {
 		 */
 		CORO_INVOKE_2(CoroScheduler.waitForSingleObject, GLOBALS._hAskChoice, CORO_INFINITE);
 
-		// WORKAROUND: Introduce a single frame delay so that if there are multiple actions running, 
+		// WORKAROUND: Introduce a single frame delay so that if there are multiple actions running,
 		// they all have time to be signalled before resetting the event. This fixes a problem where
-		// if you try to use the 'shrimp' on the parrot a second time after trying to first use it 
+		// if you try to use the 'shrimp' on the parrot a second time after trying to first use it
 		// whilst the parrot was talking, the cursor wouldn't be re-enabled afterwards
 		CORO_SLEEP(1);
 
@@ -2019,7 +2019,7 @@ bool mpalExecuteScript(int nScript) {
 
 
 /**
- * Install a custom routine That will be called by MPAL every time the pattern 
+ * Install a custom routine That will be called by MPAL every time the pattern
  * of an item has been changed.
  *
  * @param lpiifCustom		Custom function to install
@@ -2032,7 +2032,7 @@ void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCus) {
 /**
  * Process the idle actions of the items on one location.
  *
- * @param nLoc				Number of the location whose items must be processed 
+ * @param nLoc				Number of the location whose items must be processed
  * for idle actions.
  * @returns		TRUE if all OK, and FALSE if it exceeded the maximum limit.
  * @remarks		The maximum number of locations that can be polled
@@ -2118,7 +2118,7 @@ void mpalSaveState(byte *buf) {
 	lockVar();
 	WRITE_LE_UINT32(buf, GLOBALS._nVars);
 	memcpy(buf + 4, (byte *)GLOBALS._lpmvVars, GLOBALS._nVars * sizeof(MPALVAR));
-	unlockVar();	
+	unlockVar();
 }
 
 
@@ -2133,7 +2133,7 @@ int mpalLoadState(byte *buf) {
 	globalFree(GLOBALS._hVars);
 
 	GLOBALS._nVars = READ_LE_UINT32(buf);
-	
+
 	GLOBALS._hVars = globalAllocate(GMEM_ZEROINIT | GMEM_MOVEABLE, GLOBALS._nVars * sizeof(MPALVAR));
 	lockVar();
 	memcpy((byte *)GLOBALS._lpmvVars, buf + 4, GLOBALS._nVars * sizeof(MPALVAR));
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 251e78afdfa9..20f2b0b17021 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -34,9 +34,9 @@
 /*
  * MPAL (MultiPurpose Adventure Language) is a high level language
  * for the definition of adventure. Through the use of MPAL you can describe
- * storyboard the adventure, and then use it with any user interface. 
- * In fact, unlike many other similar products, MPAL is not programmed through 
- * the whole adventure, but are defined only the locations, objects, as they may 
+ * storyboard the adventure, and then use it with any user interface.
+ * In fact, unlike many other similar products, MPAL is not programmed through
+ * the whole adventure, but are defined only the locations, objects, as they may
  * interact with each other, etc.. thus making MPAL useful for any type of adventure.
  */
 
@@ -64,16 +64,16 @@
 /*
  * A custom function and a function specified by the program that uses the
  * library, to perform the particular code. The custom functions are
- * retrieved from the library as specified in the source MPAL, and in particular 
+ * retrieved from the library as specified in the source MPAL, and in particular
  * in defining the behavior of an item with some action.
  *
  * To use the custom functions, you need to prepare an array of
- * pointers to functions (such as using the type casting LPCUSTOMFUNCTION, 
+ * pointers to functions (such as using the type casting LPCUSTOMFUNCTION,
  * (defined below), and pass it as second parameter to mpalInit (). Note you
- * must specify the size of the array, as elements of pointers and which do not 
- * contain the same: the library will call it only those functions specified in 
- * the source MPAL. It can be useful, for debugging reasons, do not bet 
- * the shares of arrays used to debugging function, to avoid unpleasant crash, 
+ * must specify the size of the array, as elements of pointers and which do not
+ * contain the same: the library will call it only those functions specified in
+ * the source MPAL. It can be useful, for debugging reasons, do not bet
+ * the shares of arrays used to debugging function, to avoid unpleasant crash,
  * if it has been made an error in source and / or some oversight in the code.
  *
  */
@@ -115,7 +115,7 @@ enum QueryCoordinates {
 
 
 /**
- * Query can be used with mpalQuery methods. In practice corresponds all claims 
+ * Query can be used with mpalQuery methods. In practice corresponds all claims
  * that can do at the library
  */
 enum QueryTypes {
@@ -176,7 +176,7 @@ typedef void (*LPCUSTOMFUNCTION)(CORO_PARAM, uint32, uint32, uint32, uint32);
 typedef LPCUSTOMFUNCTION *LPLPCUSTOMFUNCTION;
 
 /**
- * 
+ *
  * Define an IRQ of an item that is called when the  pattern changes or the status of an item
  */
 typedef void (*LPITEMIRQFUNCTION)(uint32, int, int);
@@ -202,8 +202,8 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  *
  * @param lpszVarName		Nome della variabile (ASCIIZ)
  * @returns		Global variable value
- * @remarks		This query was implemented for debugging. The program, 
- *				if well designed, should not need to access variables from 
+ * @remarks		This query was implemented for debugging. The program,
+ *				if well designed, should not need to access variables from
  *				within the library.
  */
 #define mpalQueryGlobalVar(lpszVarName)                 \
@@ -313,7 +313,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * @param nPeriod           Number of words
  * @returns		A pointer to the string of words, or NULL on failure.
  * @remarks		The string must be freed after use using the memory manager.
- * Unlike normal messages, the sentences of dialogue are formed by a single 
+ * Unlike normal messages, the sentences of dialogue are formed by a single
  * string terminated with 0.
  */
 #define mpalQueryDialogPeriod(nPeriod)                  \
@@ -340,14 +340,14 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
         (uint32 *)mpalQueryHANDLE(MPQ_DIALOG_SELECTLIST, (uint32)(nChoice))
 
 /**
- * Warns the library that the user has selected, in a certain choice of the current dialog, 
+ * Warns the library that the user has selected, in a certain choice of the current dialog,
  * corresponding option at a certain given.
  *
  * @param nChoice			Choice number of the choice that was in progress
  * @param dwData			Option that was selected by the user.
  * @returns		TRUE if all OK, FALSE on failure.
- * @remarks		After execution of this query, MPAL continue 
- * Groups according to the execution of the dialogue. And necessary so the game 
+ * @remarks		After execution of this query, MPAL continue
+ * Groups according to the execution of the dialogue. And necessary so the game
  * remains on hold again for another chosen by mpalQueryDialogWaitForChoice ().
  */
 #define mpalQueryDialogSelection(nChoice, dwData)        \
@@ -357,15 +357,15 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
         mpalQueryDWORD(MPQ_DIALOG_SELECTION, (uint32)(nChoice), (uint32)(dwData))
 
 /**
- * Warns the library an action was performed on a Object. 
+ * Warns the library an action was performed on a Object.
  * The library will call custom functions, if necessary.
  *
  * @param nAction			Action number
  * @param nItem				Item number
  * @param dwParam			Action parameter
- * @returns		Handle to the thread that is performing the action, or CORO_INVALID_PID_VALUE 
+ * @returns		Handle to the thread that is performing the action, or CORO_INVALID_PID_VALUE
  * if the action is not defined for the item, or the item is inactive.
- * @remarks		The parameter is used primarily to implement actions 
+ * @remarks		The parameter is used primarily to implement actions
  * as "U.S." involving two objects together. The action will be executed only
  * if the item is active, ie if its status is a positive number greater than 0.
  */
@@ -452,7 +452,7 @@ bool mpalExecuteScript(int nScript);
 uint32 mpalGetError();
 
 /**
- * Install a custom routine That will be called by MPAL every time the pattern 
+ * Install a custom routine That will be called by MPAL every time the pattern
  * of an item has been changed.
  *
  * @param lpiifCustom		Custom function to install
@@ -462,7 +462,7 @@ void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
 /**
  * Process the idle actions of the items on one location.
  *
- * @param nLoc				Number of the location whose items must be processed 
+ * @param nLoc				Number of the location whose items must be processed
  * for idle actions.
  * @returns		TRUE if all OK, and FALSE if it exceeded the maximum limit.
  * @remarks		The maximum number of locations that can be polled
diff --git a/engines/tony/mpal/mpaldll.h b/engines/tony/mpal/mpaldll.h
index e637362bdffa..a95003ef978a 100644
--- a/engines/tony/mpal/mpaldll.h
+++ b/engines/tony/mpal/mpaldll.h
@@ -230,7 +230,7 @@ struct MPALSCRIPT {
 
 		byte nCmds;
 		uint32 CmdNum[MAX_COMMANDS_PER_MOMENT];
-  
+
 	} Moment[MAX_MOMENTS_PER_SCRIPT];
 
 } PACKED_STRUCT;
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 3a1c6746c811..0f9f1c2bbeb4 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -416,7 +416,7 @@ void FPSfx::soundCheckProcess(CORO_PARAM, const void *param) {
 }
 
 /**
- * Default constructor. 
+ * Default constructor.
  *
  * @remarks             Do *NOT* declare an object directly, but rather
  *                      create it using FPSound::CreateStream()
@@ -436,7 +436,7 @@ FPStream::FPStream(bool bSoundOn) {
 }
 
 /**
- * Default destructor. 
+ * Default destructor.
  *
  * @remarks             It calls CloseFile() if needed.
  */
@@ -455,9 +455,9 @@ FPStream::~FPStream() {
 }
 
 /**
- * Releases the memory object. 
+ * Releases the memory object.
  *
- * @remarks             Must be called when the object is no longer used 
+ * @remarks             Must be called when the object is no longer used
  *                      and **ONLY** if the object was created by
  *                      FPSound::CreateStream().
  *                      Object pointers are no longer valid after this call.
@@ -522,8 +522,8 @@ bool FPStream::loadFile(const Common::String &fileName, uint32 dwCodType, int nB
  *
  * @returns             For safety, the destructor calls unloadFile() if it has not
  *                      been mentioned explicitly.
- * 
- * @remarks             It is necessary to call this function to free the 
+ *
+ * @remarks             It is necessary to call this function to free the
  *                      memory used by the stream.
  */
 bool FPStream::unloadFile() {
@@ -580,7 +580,7 @@ bool FPStream::play() {
  * Closes the stream.
  *
  * @returns             True is everything is OK, False otherwise
- * 
+ *
  */
 
 bool FPStream::stop(bool bSync) {
diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index ca71652f205c..bd858e5bcac5 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -36,7 +36,7 @@
 #include "tony/utils.h"
 
 namespace Audio {
-class RewindableAudioStream;	
+class RewindableAudioStream;
 }
 
 namespace Tony {
@@ -253,7 +253,7 @@ class FPStream {
 	Common::File _file;                    // File handle used for the stream
 
 	bool _bSoundSupported;                 // True if the sound is active
-	bool _bFileLoaded;                     // True if the file is open 
+	bool _bFileLoaded;                     // True if the file is open
 	bool _bLoop;                           // True if the stream should loop
 	bool _bDoFadeOut;                      // True if fade out is required
 	bool _bSyncExit;
@@ -268,7 +268,7 @@ class FPStream {
 public:
 
 	/**
-	 * Default constructor. 
+	 * Default constructor.
 	 *
 	 * @remarks             Do *NOT* declare an object directly, but rather
 	 *                      create it using FPSound::CreateStream()
@@ -277,7 +277,7 @@ class FPStream {
 	FPStream(bool bSoundOn);
 
 	/**
-	 * Default destructor. 
+	 * Default destructor.
 	 *
 	 * @remarks             It calls CloseFile() if needed.
 	 */
@@ -285,9 +285,9 @@ class FPStream {
 	~FPStream();
 
 	/**
-	 * Releases the memory object. 
+	 * Releases the memory object.
 	 *
-	 * @remarks             Must be called when the object is no longer used 
+	 * @remarks             Must be called when the object is no longer used
 	 *                      and **ONLY** if the object was created by
 	 *                      FPSound::CreateStream().
 	 *                      Object pointers are no longer valid after this call.
@@ -311,8 +311,8 @@ class FPStream {
 	 *
 	 * @returns             For safety, the destructor calls unloadFile() if it has not
 	 *                      been mentioned explicitly.
-	 * 
-	 * @remarks             It is necessary to call this function to free the 
+	 *
+	 * @remarks             It is necessary to call this function to free the
 	 *                      memory used by the stream.
 	 */
 
diff --git a/engines/tony/utils.cpp b/engines/tony/utils.cpp
index a3f79decaf0e..70c33e71ee3f 100644
--- a/engines/tony/utils.cpp
+++ b/engines/tony/utils.cpp
@@ -177,13 +177,13 @@ void RMPoint::readFromStream(Common::ReadStream &ds) {
 *       RMPointReference methods
 \****************************************************************************/
 
-RMPointReference &RMPointReference::operator=(const RMPoint &p) { 
-	_x = p._x; _y = p._y; 
+RMPointReference &RMPointReference::operator=(const RMPoint &p) {
+	_x = p._x; _y = p._y;
 	return *this;
 }
 
 RMPointReference &RMPointReference::operator-=(const RMPoint &p) {
-	_x -= p._x; _y -= p._y; 
+	_x -= p._x; _y -= p._y;
 	return *this;
 }