TONY: Fix some formatting

1 files changed, 178 insertions, 179 deletions

diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
index a2b58f660e..384e80f209 100644
--- a/engines/tony/gfxengine.cpp
+++ b/engines/tony/gfxengine.cpp
@@ -68,9 +68,9 @@ RMGfxEngine::RMGfxEngine() {
 	m_nCurLoc = 0;
 	m_curAction = TA_GOTO;
 	m_curActionObj = 0;
-	m_nWipeType	= 0;
+	m_nWipeType = 0;
 	m_hWipeEvent = 0;
-	m_nWipeStep	= 0;
+	m_nWipeStep = 0;
 	m_bMustEnterMenu = false;
 	m_bWiping = false;
 	m_bGUIOption = false;
@@ -90,7 +90,7 @@ RMGfxEngine::~RMGfxEngine() {
 
 void RMGfxEngine::OpenOptionScreen(CORO_PARAM, int type) {
 	CORO_BEGIN_CONTEXT;
-		bool bRes;
+	bool bRes;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
@@ -120,9 +120,9 @@ void RMGfxEngine::OpenOptionScreen(CORO_PARAM, int type) {
 		m_point.SetCustomPointer(NULL);
 		EnableMouse();
 		_vm->GrabThumbnail();
-		
+
 		// Esce la IDLE onde evitare la morte prematura in caricamento
-		m_bMustEnterMenu = true;							
+		m_bMustEnterMenu = true;
 		if (type == 1 || type == 2) {
 			GLOBALS.bIdleExited = true;
 		} else {
@@ -144,7 +144,7 @@ void RMGfxEngine::DoFrame(CORO_PARAM, bool bDrawLocation) {
 	CORO_BEGIN_CODE(_ctx);
 
 	g_system->lockMutex(csMainLoop);
-	
+
 	// Poll dei dispositivi di input
 	m_input.Poll();
 
@@ -153,8 +153,8 @@ void RMGfxEngine::DoFrame(CORO_PARAM, bool bDrawLocation) {
 		m_bMustEnterMenu = false;
 		GLOBALS.bIdleExited = false;
 	}
-	
-  if (m_bOption) {
+
+	if (m_bOption) {
 		CORO_INVOKE_1(m_opt.DoFrame, &m_input);
 		m_bOption = !m_opt.IsClosing();
 		if (!m_bOption) {
@@ -177,33 +177,32 @@ void RMGfxEngine::DoFrame(CORO_PARAM, bool bDrawLocation) {
 				// **************
 				if (m_input.MouseLeftClicked()/* && m_itemName.IsItemSelected()*/) {
 					// Left click attiva il combine, se siamo su un oggetto
-					if (m_inv.LeftClick(m_input.MousePos(),m_curActionObj)) {
+					if (m_inv.LeftClick(m_input.MousePos(), m_curActionObj)) {
 						m_curAction = TA_COMBINE;
 						m_point.SetAction(m_curAction);
 					}
-				}
-				else			
+				} else
 
-				// CLICK DESTRO
-				// ************
-				if (m_input.MouseRightClicked()) {
-					if(m_itemName.IsItemSelected()) {
-						m_curActionObj=0;
-						m_inv.RightClick(m_input.MousePos());
+					// CLICK DESTRO
+					// ************
+					if (m_input.MouseRightClicked()) {
+						if (m_itemName.IsItemSelected()) {
+							m_curActionObj = 0;
+							m_inv.RightClick(m_input.MousePos());
+						} else
+							m_inv.RightClick(m_input.MousePos());
 					} else
-						m_inv.RightClick(m_input.MousePos());
-				} else
 
-				// RILASCIO DESTRO
-				// ***************
-				if (m_input.MouseRightReleased()) {
-					if (m_inv.RightRelease(m_input.MousePos(), m_curAction)) {
-						CORO_INVOKE_3(m_tony.MoveAndDoAction, m_itemName.GetHotspot(), m_itemName.GetSelectedItem(), m_curAction);
+						// RILASCIO DESTRO
+						// ***************
+						if (m_input.MouseRightReleased()) {
+							if (m_inv.RightRelease(m_input.MousePos(), m_curAction)) {
+								CORO_INVOKE_3(m_tony.MoveAndDoAction, m_itemName.GetHotspot(), m_itemName.GetSelectedItem(), m_curAction);
 
-						m_curAction = TA_GOTO;
-						m_point.SetAction(m_curAction);
-					}
-				}
+								m_curAction = TA_GOTO;
+								m_point.SetAction(m_curAction);
+							}
+						}
 			} else {
 				// Menu Opzioni
 				// ************
@@ -236,7 +235,7 @@ void RMGfxEngine::DoFrame(CORO_PARAM, bool bDrawLocation) {
 						else if (m_itemName.GetSelectedItem() != NULL)
 							CORO_INVOKE_4(m_tony.MoveAndDoAction, m_itemName.GetHotspot(), m_itemName.GetSelectedItem(), TA_COMBINE, m_curActionObj);
 					}
-					
+
 					if (m_curAction == TA_COMBINE) {
 						m_inv.EndCombine();
 						m_point.SetSpecialPointer(RMPointer::PTR_NONE);
@@ -267,13 +266,13 @@ SKIPCLICKSINISTRO:
 						m_inter.Clicked(m_input.MousePos());
 					}
 				}
-				
+
 
 				// RILASCIO DESTRO
 				// ***************
 				if (m_input.MouseRightReleased()) {
 					if (m_bGUIInterface) {
-						if (m_inter.Released(m_input.MousePos(),m_curAction)) {
+						if (m_inter.Released(m_input.MousePos(), m_curAction)) {
 							m_point.SetAction(m_curAction);
 							CORO_INVOKE_3(m_tony.MoveAndDoAction, m_itemName.GetHotspot(), m_itemName.GetSelectedItem(), m_curAction);
 
@@ -287,7 +286,7 @@ SKIPCLICKSINISTRO:
 			// Aggiorna il nome sotto il puntatore del mouse
 			m_itemName.SetMouseCoord(m_input.MousePos());
 			if (!m_inter.Active() && !m_inv.MiniActive())
-				CORO_INVOKE_4(m_itemName.DoFrame, m_bigBuf, m_loc, m_point, m_inv);	
+				CORO_INVOKE_4(m_itemName.DoFrame, m_bigBuf, m_loc, m_point, m_inv);
 		}
 
 		// Inventario & interfaccia
@@ -297,7 +296,7 @@ SKIPCLICKSINISTRO:
 
 	// Anima Tony
 	CORO_INVOKE_2(m_tony.DoFrame, &m_bigBuf, m_nCurLoc);
-	
+
 	// Aggiorna lo scrolling per tenere Tony dentro lo schermo
 	if (m_tony.MustUpdateScrolling() && m_bLocationLoaded) {
 		RMPoint showThis = m_tony.Position();
@@ -323,31 +322,31 @@ SKIPCLICKSINISTRO:
 	// Wipe
 	if (m_bWiping) {
 		switch (m_nWipeType) {
-			case 1:
-				if (!(m_rcWipeEllipse.bottom - m_rcWipeEllipse.top >= FSTEP * 2)) {
-					CoroScheduler.setEvent(m_hWipeEvent);
-					m_nWipeType = 3;
-					break;
-				}
-				
-				m_rcWipeEllipse.top += FSTEP;
-				m_rcWipeEllipse.left += FSTEP;
-				m_rcWipeEllipse.right -= FSTEP;
-				m_rcWipeEllipse.bottom -= FSTEP;
+		case 1:
+			if (!(m_rcWipeEllipse.bottom - m_rcWipeEllipse.top >= FSTEP * 2)) {
+				CoroScheduler.setEvent(m_hWipeEvent);
+				m_nWipeType = 3;
 				break;
+			}
 
-			case 2:
-				if (!(m_rcWipeEllipse.bottom - m_rcWipeEllipse.top < 480 - FSTEP)) {
-					CoroScheduler.setEvent(m_hWipeEvent);
-					m_nWipeType = 3;
-					break;
-				}
+			m_rcWipeEllipse.top += FSTEP;
+			m_rcWipeEllipse.left += FSTEP;
+			m_rcWipeEllipse.right -= FSTEP;
+			m_rcWipeEllipse.bottom -= FSTEP;
+			break;
 
-				m_rcWipeEllipse.top -= FSTEP;
-				m_rcWipeEllipse.left -= FSTEP;
-				m_rcWipeEllipse.right += FSTEP;
-				m_rcWipeEllipse.bottom += FSTEP;
+		case 2:
+			if (!(m_rcWipeEllipse.bottom - m_rcWipeEllipse.top < 480 - FSTEP)) {
+				CoroScheduler.setEvent(m_hWipeEvent);
+				m_nWipeType = 3;
 				break;
+			}
+
+			m_rcWipeEllipse.top -= FSTEP;
+			m_rcWipeEllipse.left -= FSTEP;
+			m_rcWipeEllipse.right += FSTEP;
+			m_rcWipeEllipse.bottom += FSTEP;
+			break;
 		}
 	}
 
@@ -371,7 +370,7 @@ void RMGfxEngine::ItemIrq(uint32 dwItem, int nPattern, int nStatus) {
 			if (nPattern != -1) {
 				if (GLOBALS.bPatIrqFreeze)
 					MainFreeze();
-				item->SetPattern(nPattern,true);
+				item->SetPattern(nPattern, true);
 				if (GLOBALS.bPatIrqFreeze)
 					MainUnfreeze();
 			}
@@ -382,41 +381,41 @@ void RMGfxEngine::ItemIrq(uint32 dwItem, int nPattern, int nStatus) {
 }
 
 /*
-	// WINBUG: This is a special case for the file open/save dialog,
-	//  which sometimes pumps while it is coming up but before it has
-	//  disabled the main window.
-	HWND hWndFocus = ::GetFocus();
-	bool bEnableParent = false;
-	m_ofn.hwndOwner = PreModal();
-	AfxUnhookWindowCreate();
-	if (m_ofn.hwndOwner != NULL && ::IsWindowEnabled(m_ofn.hwndOwner)) {
-		bEnableParent = true;
-		::EnableWindow(m_ofn.hwndOwner, false);
-	}
-
-	_AFX_THREAD_STATE* pThreadState = AfxGetThreadState();
-	ASSERT(pThreadState->m_pAlternateWndInit == NULL);
-
-	if (m_ofn.Flags & OFN_EXPLORER)
-		pThreadState->m_pAlternateWndInit = this;
-	else
-		AfxHookWindowCreate(this);
-
-	int nResult;
-	if (m_bOpenFileDialog)
-		nResult = ::GetOpenFileName(&m_ofn);
-	else
-		nResult = ::GetSaveFileName(&m_ofn);
-
-	if (nResult)
-		ASSERT(pThreadState->m_pAlternateWndInit == NULL);
-	pThreadState->m_pAlternateWndInit = NULL;
-
-	// WINBUG: Second part of special case for file open/save dialog.
-	if (bEnableParent)
-		::EnableWindow(m_ofn.hwndOwner, true);
-	if (::IsWindow(hWndFocus))
-		::SetFocus(hWndFocus);
+    // WINBUG: This is a special case for the file open/save dialog,
+    //  which sometimes pumps while it is coming up but before it has
+    //  disabled the main window.
+    HWND hWndFocus = ::GetFocus();
+    bool bEnableParent = false;
+    m_ofn.hwndOwner = PreModal();
+    AfxUnhookWindowCreate();
+    if (m_ofn.hwndOwner != NULL && ::IsWindowEnabled(m_ofn.hwndOwner)) {
+        bEnableParent = true;
+        ::EnableWindow(m_ofn.hwndOwner, false);
+    }
+
+    _AFX_THREAD_STATE* pThreadState = AfxGetThreadState();
+    ASSERT(pThreadState->m_pAlternateWndInit == NULL);
+
+    if (m_ofn.Flags & OFN_EXPLORER)
+        pThreadState->m_pAlternateWndInit = this;
+    else
+        AfxHookWindowCreate(this);
+
+    int nResult;
+    if (m_bOpenFileDialog)
+        nResult = ::GetOpenFileName(&m_ofn);
+    else
+        nResult = ::GetSaveFileName(&m_ofn);
+
+    if (nResult)
+        ASSERT(pThreadState->m_pAlternateWndInit == NULL);
+    pThreadState->m_pAlternateWndInit = NULL;
+
+    // WINBUG: Second part of special case for file open/save dialog.
+    if (bEnableParent)
+        ::EnableWindow(m_ofn.hwndOwner, true);
+    if (::IsWindow(hWndFocus))
+        ::SetFocus(hWndFocus);
 */
 
 
@@ -427,46 +426,46 @@ void RMGfxEngine::SelectLocation(const RMPoint &ptTonyStart, const RMPoint &star
 
 	// @@@ Con TonyStart=-1,-1 allora usa la posizione scritta nella locazione
 
-  // Sceglie la locazione
-	ZeroMemory(lpszFileName,512);
-	ZeroMemory(&ofn,sizeof(ofn));
-  ofn.lStructSize=sizeof(ofn);
-  ofn.hwndOwner=NULL;
-  ofn.lpstrFilter="Locazione (*.LOC)\0*.LOC\0Locazione ottimizzata (*.LOX)\0*.LOX\0Tutti i files (*.*)\0*.*\0";
-  ofn.lpstrCustomFilter=NULL;
-  ofn.nFilterIndex=1;
-  ofn.lpstrFile=lpszFileName;
-  ofn.nMaxFile=512;
-  ofn.lpstrInitialDir=NULL;
-  ofn.lpstrTitle="Load Location";
-  ofn.Flags=OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_PATHMUSTEXIST;
-
-  if (!GetOpenFileName(&ofn))
+	// Sceglie la locazione
+	ZeroMemory(lpszFileName, 512);
+	ZeroMemory(&ofn, sizeof(ofn));
+	ofn.lStructSize = sizeof(ofn);
+	ofn.hwndOwner = NULL;
+	ofn.lpstrFilter = "Locazione (*.LOC)\0*.LOC\0Locazione ottimizzata (*.LOX)\0*.LOX\0Tutti i files (*.*)\0*.*\0";
+	ofn.lpstrCustomFilter = NULL;
+	ofn.nFilterIndex = 1;
+	ofn.lpstrFile = lpszFileName;
+	ofn.nMaxFile = 512;
+	ofn.lpstrInitialDir = NULL;
+	ofn.lpstrTitle = "Load Location";
+	ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
+
+	if (!GetOpenFileName(&ofn))
 		ASSERT(0);
 
 	// Carica la locazione
 	m_loc.Load(lpszFileName);
 	m_bLocationLoaded = true;
-	m_nCurLoc=m_loc.TEMPGetNumLoc();
-	
-	if (ptTonyStart.x==-1 && ptTonyStart.y==-1)
-		InitForNewLocation(m_loc.TEMPGetNumLoc(),m_loc.TEMPGetTonyStart(),RMPoint(-1,-1));
+	m_nCurLoc = m_loc.TEMPGetNumLoc();
+
+	if (ptTonyStart.x == -1 && ptTonyStart.y == -1)
+		InitForNewLocation(m_loc.TEMPGetNumLoc(), m_loc.TEMPGetTonyStart(), RMPoint(-1, -1));
 	else
-		InitForNewLocation(m_loc.TEMPGetNumLoc(),ptTonyStart,start);
+		InitForNewLocation(m_loc.TEMPGetNumLoc(), ptTonyStart, start);
 #endif
 }
 
 void RMGfxEngine::InitForNewLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
 	if (start.x == -1 || start.y == -1) {
-		start.x = ptTonyStart.x-RM_SX / 2;
-		start.y = ptTonyStart.y-RM_SY / 2;
+		start.x = ptTonyStart.x - RM_SX / 2;
+		start.y = ptTonyStart.y - RM_SY / 2;
 	}
 
 	m_loc.SetScrollPosition(start);
-	
-	if (ptTonyStart.x==0 && ptTonyStart.y == 0) {
+
+	if (ptTonyStart.x == 0 && ptTonyStart.y == 0) {
 	} else {
-		m_tony.SetPosition(ptTonyStart,nLoc);
+		m_tony.SetPosition(ptTonyStart, nLoc);
 		m_tony.SetScrollPosition(start);
 	}
 
@@ -484,10 +483,10 @@ uint32 RMGfxEngine::LoadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
 	bool bLoaded;
 	int i;
 
-	m_nCurLoc=nLoc;
+	m_nCurLoc = nLoc;
 
 	bLoaded = false;
-	for (i=0; i < 5; i++) {
+	for (i = 0; i < 5; i++) {
 		// Retry sul loading della locazione
 		RMRes res(m_nCurLoc);
 		if (!res.IsValid())
@@ -501,13 +500,13 @@ uint32 RMGfxEngine::LoadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
 		}
 #endif
 		m_loc.Load(res);
-		InitForNewLocation(nLoc,ptTonyStart,start);
+		InitForNewLocation(nLoc, ptTonyStart, start);
 		bLoaded = true;
 		break;
 	}
-	
+
 	if (!bLoaded)
-		SelectLocation(ptTonyStart,start);
+		SelectLocation(ptTonyStart, start);
 
 	if (m_bOption)
 		m_opt.ReInit(m_bigBuf);
@@ -520,11 +519,11 @@ uint32 RMGfxEngine::LoadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
 
 void RMGfxEngine::UnloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result) {
 	CORO_BEGIN_CONTEXT;
-		uint32 h;
+	uint32 h;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
-	
+
 	// Scarica tutta la memoria della locazione
 	CORO_INVOKE_2(mpalEndIdlePoll, m_nCurLoc, NULL);
 
@@ -538,7 +537,7 @@ void RMGfxEngine::UnloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result) {
 	MainFreeze();
 
 	m_bLocationLoaded = false;
-	
+
 	m_bigBuf.ClearOT();
 	m_loc.Unload();
 
@@ -549,19 +548,19 @@ void RMGfxEngine::UnloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result) {
 }
 
 void RMGfxEngine::Init(/*HINSTANCE hInst*/) {
-/*
-	//RECUPERARE UNA LOCAZIONE:
-
-	RMRes res(5);
-	ASSERT(res.IsValid());
-	FILE *f;
-	f=fopen("c:\\code\\rm\\new\\pippo.loc","wb");
-	fwrite(res,1,5356900,f);
-	fclose(f);
-*/
+	/*
+	    //RECUPERARE UNA LOCAZIONE:
+
+	    RMRes res(5);
+	    ASSERT(res.IsValid());
+	    FILE *f;
+	    f=fopen("c:\\code\\rm\\new\\pippo.loc","wb");
+	    fwrite(res,1,5356900,f);
+	    fclose(f);
+	*/
 
 	// Schermata di loading
-	RMResRaw *raw; 
+	RMResRaw *raw;
 	RMGfxSourceBuffer16 *load = NULL;
 	INIT_GFX16_FROMRAW(20038, load);
 	m_bigBuf.AddPrim(new RMGfxPrimitive(load));
@@ -592,8 +591,8 @@ void RMGfxEngine::Init(/*HINSTANCE hInst*/) {
 	// Inizializza la funzione di IRQ di Item per l'MPAL
 	GLOBALS.GfxEngine = this;
 	mpalInstallItemIrq(ItemIrq);
-	
-	// Inizializza DirectInput	
+
+	// Inizializza DirectInput
 	m_input.Init(/*hInst*/);
 
 	// Inizializza il puntatore del mouse
@@ -607,25 +606,25 @@ void RMGfxEngine::Init(/*HINSTANCE hInst*/) {
 	m_inv.Init();
 	m_inter.Init();
 
-	// Carica la locazione e setta le priorità		@@@@@
+	// Carica la locazione e setta le priorità      @@@@@
 	m_bLocationLoaded = false;
-/*
-	m_nCurLoc=1;
-	RMRes res(m_nCurLoc);
-	m_loc.Load(res);
-	m_loc.SetPriority(1);
-	m_tony.SetPosition(RMPoint(201,316),1);
-	//m_tony.SetPosition(RMPoint(522,305),2);
-	//m_tony.SetPosition(RMPoint(158,398),4);
-	m_tony.SetPattern(m_tony.PAT_STANDDOWN);
-	m_curAction=TA_GOTO;
-*/ 
+	/*
+	    m_nCurLoc=1;
+	    RMRes res(m_nCurLoc);
+	    m_loc.Load(res);
+	    m_loc.SetPriority(1);
+	    m_tony.SetPosition(RMPoint(201,316),1);
+	    //m_tony.SetPosition(RMPoint(522,305),2);
+	    //m_tony.SetPosition(RMPoint(158,398),4);
+	    m_tony.SetPattern(m_tony.PAT_STANDDOWN);
+	    m_curAction=TA_GOTO;
+	*/
 	EnableInput();
 
 	// Inizio del gioco
 	//m_tony.ExecuteAction(4,1,0);    //PREGAME
-	
-	m_tony.ExecuteAction(20,1,0);
+
+	m_tony.ExecuteAction(20, 1, 0);
 
 //	theLog << "Seleziona la locazione\n";
 	//LoadLocation(1,RMPoint(201,316),RMPoint(-1,-1));
@@ -639,9 +638,9 @@ void RMGfxEngine::Init(/*HINSTANCE hInst*/) {
 	//LoadLocation(25,RMPoint(221,415),RMPoint(-1,-1));
 	//LoadLocation(16,RMPoint(111,438),RMPoint(-1,-1));
 	//LoadLocation(60,RMPoint(18,302),RMPoint(-1,-1));
-	
+
 	// CASTELLO
-	
+
 	//LoadLocation(40,RMPoint(233,441),RMPoint(-1,-1));
 }
 
@@ -716,14 +715,14 @@ void RMGfxEngine::SaveState(const char *fn, byte *curThumb, const char *name, bo
 	mpalSaveState(state);
 
 	thumbsize = 160 * 120 * 2;
-	
+
 	buf[0] = 'R';
 	buf[1] = 'M';
 	buf[2] = 'S';
 	buf[3] = TONY_SAVEGAME_VERSION;
 
 	f = g_system->getSavefileManager()->openForSaving(fn);
-	if (f == NULL) 
+	if (f == NULL)
 		return;
 
 	f->write(buf, 4);
@@ -763,13 +762,13 @@ void RMGfxEngine::SaveState(const char *fn, byte *curThumb, const char *name, bo
 
 	// New Ver5
 	bool bStat;
-	
+
 	// Saves the state of the shepherdess and show yourself
 	bStat = m_tony.GetPastorella();
 	f->writeByte(bStat);
 	bStat = m_inter.GetPalesati();
 	f->writeByte(bStat);
-	
+
 	// Save the chars
 	CharsSaveAll(f);
 
@@ -805,20 +804,20 @@ void RMGfxEngine::SaveState(const char *fn, byte *curThumb, const char *name, bo
 void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 	// PROBLEMA: Bisognerebbe caricare la locazione in un thread a parte per fare la OnEnter ...
 	CORO_BEGIN_CONTEXT;
-		Common::InSaveFile *f;
-		byte *state, *statecmp;
-		uint size, sizecmp;
-		char buf[4];
-		RMPoint tp;
-		int loc;
-		int ver;
-		int i;
+	Common::InSaveFile *f;
+	byte *state, *statecmp;
+	uint size, sizecmp;
+	char buf[4];
+	RMPoint tp;
+	int loc;
+	int ver;
+	int i;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
 	_ctx->f = g_system->getSavefileManager()->openForLoading(fn);
-	if (_ctx->f == NULL) 
+	if (_ctx->f == NULL)
 		return;
 	_ctx->f->read(_ctx->buf, 4);
 
@@ -826,14 +825,14 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 		delete _ctx->f;
 		return;
 	}
-	
+
 	_ctx->ver = _ctx->buf[3];
-	
+
 	if (_ctx->ver == 0 || _ctx->ver > TONY_SAVEGAME_VERSION) {
 		delete _ctx->f;
 		return;
 	}
-	
+
 	if (_ctx->ver >= 0x3) {
 		// There is a thumbnail. If the version is between 5 and 7, it's compressed
 		if ((_ctx->ver >= 0x5) && (_ctx->ver <= 0x7)) {
@@ -854,7 +853,7 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 		_ctx->f->seek(1, SEEK_CUR);
 	}
 
-	if (_ctx->ver >= 0x4) {	// Skip the savegame name, which serves no purpose
+	if (_ctx->ver >= 0x4) { // Skip the savegame name, which serves no purpose
 		_ctx->i = _ctx->f->readByte();
 		_ctx->f->seek(_ctx->i, SEEK_CUR);
 	}
@@ -870,7 +869,7 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 		_ctx->state = new byte[_ctx->size];
 		_ctx->statecmp = new byte[_ctx->sizecmp];
 		_ctx->f->read(_ctx->statecmp, _ctx->sizecmp);
-		lzo1x_decompress(_ctx->statecmp,_ctx->sizecmp,_ctx->state,&_ctx->size);
+		lzo1x_decompress(_ctx->statecmp, _ctx->sizecmp, _ctx->state, &_ctx->size);
 		delete[] _ctx->statecmp;
 	} else {
 		// Read uncompressed MPAL data
@@ -888,7 +887,7 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 	m_inv.LoadState(_ctx->state);
 	delete[] _ctx->state;
 
-	if (_ctx->ver >= 0x2) {	  // Versione 2: box please
+	if (_ctx->ver >= 0x2) {   // Versione 2: box please
 		_ctx->size = _ctx->f->readUint32LE();
 		_ctx->state = new byte[_ctx->size];
 		_ctx->f->read(_ctx->state, _ctx->size);
@@ -897,13 +896,13 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 	}
 
 	if (_ctx->ver >= 5) {
-	  // Versione 5: 
+		// Versione 5:
 		bool bStat = false;
-		
+
 		bStat = _ctx->f->readByte();
-		m_tony.SetPastorella(bStat);		
+		m_tony.SetPastorella(bStat);
 		bStat = _ctx->f->readByte();
-		m_inter.SetPalesati(bStat);		
+		m_inter.SetPalesati(bStat);
 
 		CharsLoadAll(_ctx->f);
 	}
@@ -939,10 +938,10 @@ void RMGfxEngine::LoadState(CORO_PARAM, const char *fn) {
 	delete _ctx->f;
 
 	CORO_INVOKE_2(UnloadLocation, false, NULL);
-	LoadLocation(_ctx->loc,_ctx->tp,RMPoint(-1, -1));
+	LoadLocation(_ctx->loc, _ctx->tp, RMPoint(-1, -1));
 	m_tony.SetPattern(RMTony::PAT_STANDRIGHT);
 	MainUnfreeze();
-	
+
 	// On older versions, need to an enter action
 	if (_ctx->ver < 5)
 		mpalQueryDoAction(0, _ctx->loc, 0);
@@ -970,8 +969,8 @@ void RMGfxEngine::PauseSound(bool bPause) {
 
 void RMGfxEngine::InitWipe(int type) {
 	m_bWiping = true;
-	m_nWipeType=type;
-	m_nWipeStep=0;
+	m_nWipeType = type;
+	m_nWipeStep = 0;
 
 	if (m_nWipeType == 1)
 		m_rcWipeEllipse = Common::Rect(80, 0, 640 - 80, 480);