From 95025312a7c3b184fef3818ece1f1d55b7fb19d1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 14 Dec 2012 01:49:22 +0100
Subject: HOPKINS: Janitorial - Remove trailing space and double semi columns

---
 engines/hopkins/anim.cpp           | 118 +++----
 engines/hopkins/computer.cpp       | 138 ++++----
 engines/hopkins/debugger.h         |   2 +-
 engines/hopkins/detection_tables.h |  18 +
 engines/hopkins/dialogs.cpp        |  58 ++--
 engines/hopkins/events.cpp         |  24 +-
 engines/hopkins/files.cpp          |  18 +-
 engines/hopkins/font.cpp           |  52 +--
 engines/hopkins/font.h             |   2 +-
 engines/hopkins/globals.cpp        |  42 +--
 engines/hopkins/globals.h          |   4 +-
 engines/hopkins/graphics.cpp       | 290 ++++++++--------
 engines/hopkins/graphics.h         |   2 +-
 engines/hopkins/lines.cpp          | 516 ++++++++++++++--------------
 engines/hopkins/menu.cpp           |  32 +-
 engines/hopkins/objects.cpp        | 688 ++++++++++++++++++-------------------
 engines/hopkins/objects.h          |  10 +-
 engines/hopkins/saveload.cpp       |  14 +-
 engines/hopkins/script.cpp         |  48 +--
 engines/hopkins/sound.cpp          |  28 +-
 engines/hopkins/sound.h            |   2 +-
 engines/hopkins/talk.cpp           | 216 ++++++------
 22 files changed, 1170 insertions(+), 1152 deletions(-)

(limited to 'engines')

diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 80e1bdb19b..601ff00e9e 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -48,8 +48,8 @@ AnimationManager::AnimationManager() {
  */
 void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3) {
 	bool breakFlag;
-	bool hasScreenCopy; 
-	byte *screenCopy = NULL; 
+	bool hasScreenCopy;
+	byte *screenCopy = NULL;
 	byte *screenP = NULL;
 	int frameNumber;
 	byte *ptr = NULL;
@@ -193,7 +193,7 @@ EXIT:
 		nbytes = f.readUint32LE();
 		f.skip(14);
 		f.read(screenP, nbytes);
-	
+
 		memcpy(screenCopy, screenP, 0x4B000u);
 
 		breakFlag = false;
@@ -204,7 +204,7 @@ EXIT:
 				breakFlag = true;
 			if (strncmp((char *)ptr, "IMAGE=", 6))
 				breakFlag = true;
-			
+
 			if (!breakFlag) {
 				f.read(screenP, READ_LE_UINT32(ptr + 8));
 				if (*screenP != kByteStop)
@@ -219,7 +219,7 @@ EXIT:
 			_vm->_graphicsManager.FADE_OUTW_LINUX(screenCopy);
 		screenCopy = _vm->_globals.freeMemory(screenCopy);
 	}
-	
+
 	_vm->_graphicsManager.FADE_LINUX = 0;
 	f.close();
 	ptr = _vm->_globals.freeMemory(ptr);
@@ -230,15 +230,15 @@ EXIT:
  * Play Animation, type 2
  */
 void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint32 a3, uint32 a4) {
-	int v5; 
-	int v8; 
-	byte *ptr; 
-	int v11; 
-	byte *v12; 
-	byte *v13; 
-	int v15; 
-	size_t nbytes; 
-	byte buf[6]; 
+	int v5;
+	int v8;
+	byte *ptr;
+	int v11;
+	byte *v12;
+	byte *v13;
+	int v15;
+	size_t nbytes;
+	byte buf[6];
 	Common::File f;
 
 	if (_vm->shouldQuit())
@@ -268,7 +268,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
 		f.read(_vm->_graphicsManager.Palette, 0x320u);
 		f.read(&buf, 4);
 		nbytes = f.readUint32LE();
-		f.readUint32LE();		
+		f.readUint32LE();
 		f.readUint16LE();
 		f.readUint16LE();
 		f.readUint16LE();
@@ -276,7 +276,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
 		f.readUint16LE();
 
 		f.read(v12, nbytes);
-	
+
 		_vm->_graphicsManager.Cls_Pal();
 		v11 = _vm->_graphicsManager.SCROLL;
 		_vm->_graphicsManager.SCANLINE(SCREEN_WIDTH);
@@ -392,7 +392,7 @@ LABEL_48:
 		_vm->_soundManager.playAnim_SOUND(v15);
 		memset(&buf, 0, 6u);
 		memset(v13, 0, 0x13u);
-		
+
 		if (f.read(v13, 0x10) != 0x10)
 			v5 = -1;
 
@@ -554,9 +554,9 @@ LABEL_114:
 	f.close();
 
 	if (_vm->_graphicsManager.FADE_LINUX == 2 && !v8) {
-		byte *ptra; 
+		byte *ptra;
 		ptra = _vm->_globals.allocMemory(0x4B000u);
-		
+
 		f.seek(0);
 		f.read(&buf, 6);
 		f.read(_vm->_graphicsManager.Palette, 0x320u);
@@ -669,11 +669,11 @@ void AnimationManager::loadAnim(const Common::String &animName) {
 
 	Common::String filename = animName + ".ANI";
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename);
-	
+
 	Common::File f;
 	if (!f.open(_vm->_globals.NFICHIER))
 		error("Failed to open %s", _vm->_globals.NFICHIER.c_str());
-	
+
 	int filesize = f.size();
 	int nbytes = filesize - 115;
 	f.read(header, 10);
@@ -694,7 +694,7 @@ void AnimationManager::loadAnim(const Common::String &animName) {
 	for (int idx = 1; idx <= 6; ++idx) {
 		if (files[idx - 1][0]) {
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, files[idx - 1]);
-			
+
 			if (!f.exists(_vm->_globals.NFICHIER))
 				error("File not found");
 			if (loadSpriteBank(idx, files[idx - 1]))
@@ -736,9 +736,9 @@ void AnimationManager::clearAnim() {
  */
 int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 	byte *v3;
-	byte *v4; 
+	byte *v4;
 	byte *v13;
-	byte *ptr; 
+	byte *ptr;
 	byte *v19;
 	int result = 0;
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename);
@@ -755,14 +755,14 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 	    _vm->_globals.Bank[idx].fileHeader = 1;
 	if (*(v3 + 1) == 'O' && *(v3 + 2) == 'R')
 		_vm->_globals.Bank[idx].fileHeader = 2;
-	
+
 	if (_vm->_globals.Bank[idx].fileHeader) {
 		_vm->_globals.Bank[idx].data = v3;
 
 		bool loopCond = false;
 		int v8 = 0;
-		int width; 
-		int height; 
+		int width;
+		int height;
 		do {
 			ptr = v4;
 			width = _vm->_objectsManager.getWidth(v4, v8);
@@ -775,10 +775,10 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 			if (v8 > 249)
 				loopCond = true;
 		} while (!loopCond);
-    
+
 		if (v8 <= 249) {
 			_vm->_globals.Bank[idx].field1A = v8;
-			
+
 			Common::String ofsFilename = _vm->_globals.Bank[idx].filename1;
 			char ch;
 			do {
@@ -786,13 +786,13 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 				ofsFilename.deleteLastChar();
 			} while (ch != '.');
 			ofsFilename += ".OFS";
-			
+
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, ofsFilename);
 			Common::File f;
 			if (f.exists(_vm->_globals.NFICHIER)) {
 				v19 = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
 				v13 = v19;
-				
+
 				if (_vm->_globals.Bank[idx].field1A > 0) {
 					for (int objIdx = 0; objIdx < _vm->_globals.Bank[idx].field1A; ++objIdx) {
 						int x1 = (int16)READ_LE_UINT16(v13);
@@ -806,10 +806,10 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 							_vm->_objectsManager.set_offsetxy(_vm->_globals.Bank[idx].data, objIdx, x2, y2, 1);
 					}
 				}
-			
+
 				_vm->_globals.freeMemory(v19);
 			}
-      
+
 			result = 0;
 		} else {
 			_vm->_globals.freeMemory(ptr);
@@ -825,28 +825,28 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
 	return result;
 }
 
-/** 
+/**
  * Search Animation
  */
 void AnimationManager::searchAnim(const byte *data, int animIndex, int count) {
 	int v3;
-	const byte *v5; 
-	int v6; 
-	int v7; 
+	const byte *v5;
+	int v6;
+	int v7;
 	int v8;
-	byte *v9; 
+	byte *v9;
 	int v10;
 	int v11;
 	int v12;
-	int v13; 
-	int v15; 
-	int v16; 
-	int v17; 
-	int v19; 
+	int v13;
+	int v15;
+	int v16;
+	int v17;
+	int v19;
 	int v20;
-	int v21; 
+	int v21;
 	int v22;
-	const byte *v23; 
+	const byte *v23;
 	int v;
 
 	v21 = 0;
@@ -925,13 +925,13 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int count) {
  * Play sequence
  */
 void AnimationManager::playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3) {
-	bool readError; 
-	int v7; 
-	byte *ptr = NULL; 
-	byte *v9; 
-	byte *v10; 
+	bool readError;
+	int v7;
+	byte *ptr = NULL;
+	byte *v9;
+	byte *v10;
 	int soundNumber;
-	size_t nbytes; 
+	size_t nbytes;
 	Common::File f;
 
 	if (_vm->shouldQuit())
@@ -1106,13 +1106,13 @@ LABEL_59:
  * Play Sequence type 2
  */
 void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3) {
-	bool v4; 
-	int v7; 
-	byte *ptr = NULL; 
-	byte *v10; 
-	byte *v11 = NULL; 
-	int v13; 
-	size_t nbytes; 
+	bool v4;
+	int v7;
+	byte *ptr = NULL;
+	byte *v10;
+	byte *v11 = NULL;
+	int v13;
+	size_t nbytes;
 	Common::File f;
 
 	v7 = 0;
@@ -1258,7 +1258,7 @@ LABEL_53:
 LABEL_54:
 	if (_vm->_graphicsManager.FADE_LINUX == 2 && !v7) {
 		byte *ptra = _vm->_globals.allocMemory(0x4B000u);
-		
+
 		f.seek(0);
 		f.skip(6);
 		f.read(_vm->_graphicsManager.Palette, 0x320u);
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index e2c1ada8ef..3a23bec6c0 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -119,9 +119,9 @@ void ComputerManager::setTextPosition(int yp, int xp) {
  * @param mode		Which computer to display
  */
 void ComputerManager::showComputer(ComputerEnum mode) {
-	bool passwordMatch; 
-	char *v3; 
-	char s[12]; 
+	bool passwordMatch;
+	char *v3;
+	char s[12];
 	const char *s2;
 
 	_vm->_eventsManager._escKeyFl = false;
@@ -309,7 +309,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
 		_vm->_globals.SORTIE = 13;
 	if ((uint16)(mode - 2) <= 1u)
 		_vm->_globals.SORTIE = 14;
-	
+
 	_vm->_graphicsManager.RESET_SEGMENT_VESA();
 }
 
@@ -470,10 +470,10 @@ void ComputerManager::TXT4(int xp, int yp, int textIdx) {
 		_vm->_eventsManager.VBL();
 	} while (textIndex != textIdx && curChar != 13);
 
-	_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager.VESA_SCREEN, x1, yp, _vm->_globals.police_l, 
+	_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager.VESA_SCREEN, x1, yp, _vm->_globals.police_l,
 		12, _vm->_graphicsManager.VESA_BUFFER, x1, yp);
 	_vm->_graphicsManager.Ajoute_Segment_Vesa(x1, yp, _vm->_globals.police_l + x1, yp + 12);
-	
+
 	_vm->_eventsManager.VBL();
 	_inputBuf[textIndex] = 0;
 	_vm->_eventsManager._mouseFl = oldMouseFlag;
@@ -510,18 +510,18 @@ void ComputerManager::restoreFBIRoom() {
  * Display texts for the given menu entry
  */
 void ComputerManager::readText(int idx) {
-	uint16 v1; 
-	int v2; 
-	uint16 v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	uint16 v10; 
-	byte *ptr; 
-	Common::String v12; 
-	Common::String numStr; 
+	uint16 v1;
+	int v2;
+	uint16 v3;
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	uint16 v10;
+	byte *ptr;
+	Common::String v12;
+	Common::String numStr;
 	int num;
 
 	_vm->_eventsManager._escKeyFl = false;
@@ -554,7 +554,7 @@ void ComputerManager::readText(int idx) {
 	v4 = v3;
 	if (v3 > v1 - 1)
 		error("Error with Hopkins computer file");
-		
+
 	v10 = v3 + 3;
 	v5 = 1;
 	v6 = 5;
@@ -639,8 +639,8 @@ void ComputerManager::displayGamesSubMenu() {
  * Load Highscore from file
  */
 void ComputerManager::loadHiscore() {
-	char nextChar; 
-	byte *ptr; 
+	char nextChar;
+	byte *ptr;
 
 	_vm->_fileManager.constructLinuxFilename("HISCORE.DAT");
 	ptr = _vm->_globals.allocMemory(100);
@@ -652,21 +652,21 @@ void ComputerManager::loadHiscore() {
 			if (!nextChar)
 				nextChar = ' ';
 			_score[scoreIndex]._name += nextChar;
-		} 
+		}
 
 		for (int i = 0; i < 9; ++i) {
 			nextChar = *(ptr + i + scoreIndex * 16 + 6);
 			if (!nextChar)
 				nextChar = '0';
 			_score[scoreIndex]._score += nextChar;
-		} 
-	} 
+		}
+	}
 
 	_vm->_globals.freeMemory(ptr);
 	_breakoutHiscore = atol(_score[5]._score.c_str());
 }
 
-/** 
+/**
  * VGA 256 col
  */
 void ComputerManager::setModeVGA256() {
@@ -721,11 +721,11 @@ void ComputerManager::newLevel() {
  * Display bricks in breakout game
  */
 void ComputerManager::displayBricks() {
-	int xp; 
-	int yp; 
-	int v2; 
-	uint16 v3; 
-	int16 *v4; 
+	int xp;
+	int yp;
+	int v2;
+	uint16 v3;
+	int16 *v4;
 
 	_breakoutBrickNbr = 0;
 	_breakoutSpeed = 1;
@@ -738,7 +738,7 @@ void ComputerManager::displayBricks() {
 		if (xp != -1) {
 			if (v2 <= 6)
 				++_breakoutBrickNbr;
-			
+
 			if (v2 == 3)
 				_vm->_graphicsManager.AFFICHE_SPEEDVGA(_breakoutSpr, xp, yp, 17);
 			else if (v2 == 6)
@@ -764,8 +764,8 @@ void ComputerManager::displayBricks() {
  * Display Lives in breakout game
  */
 void ComputerManager::displayLives() {
-	int v3; 
-	int v4; 
+	int v3;
+	int v4;
 
 	int v0 = _breakoutLives - 1;
 	int v1 = 10;
@@ -792,8 +792,8 @@ void ComputerManager::displayLives() {
  * Main function for breakout game
  */
 void ComputerManager::playBreakout() {
-	int v1 = 0; 
-	int v; 
+	int v1 = 0;
+	int v;
 
 	while (!_vm->shouldQuit()) {
 		while (!_vm->shouldQuit()) {
@@ -878,10 +878,10 @@ void ComputerManager::playBreakout() {
  * @return		The selected button index: 1 = Game, 2 = Quit
  */
 int ComputerManager::displayHiscores() {
-	int yp; 
-	int buttonIndex; 
-	int xp; 
-	byte *ptr; 
+	int yp;
+	int buttonIndex;
+	int xp;
+	byte *ptr;
 
 	_vm->_graphicsManager.RESET_SEGMENT_VESA();
 	loadHiscore();
@@ -933,8 +933,8 @@ int ComputerManager::displayHiscores() {
  * Display a screen to enter player name in the case of a new hiscore
  */
 void ComputerManager::getScoreName() {
-	char curChar; 
-	byte *ptr; 
+	char curChar;
+	byte *ptr;
 
 	_vm->_graphicsManager.LOAD_IMAGEVGA("NAME.PCX");
 	_vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100);
@@ -961,7 +961,7 @@ void ComputerManager::getScoreName() {
 	}
 	_score[5]._score = "         ";
 
-	char score[16]; 
+	char score[16];
 	sprintf(score, "%d", _breakoutScore);
 	int scoreLen = 0;
 	do
@@ -982,10 +982,10 @@ void ComputerManager::getScoreName() {
  * Display current score
  */
 void ComputerManager::displayScore() {
-	int16 v0; 
-	int16 v1; 
-	int16 i; 
-	char s[40]; 
+	int16 v0;
+	int16 v1;
+	int16 i;
+	char s[40];
 
 	sprintf(s, "%d", _breakoutScore);
 	v0 = 0;
@@ -1041,17 +1041,17 @@ void ComputerManager::IMPSCORE(int a1, int a2) {
  * Save Hiscore in file
  */
 void ComputerManager::saveScore() {
-	int v1; 
-	int v2; 
-	int v4; 
-	int v6; 
-	char v8; 
-	int v9; 
-	char v11; 
-	int v14; 
-	byte *ptr; 
-	int v16[6]; 
-	int v17[6]; 
+	int v1;
+	int v2;
+	int v4;
+	int v6;
+	char v8;
+	int v9;
+	char v11;
+	int v14;
+	byte *ptr;
+	int v16[6];
+	int v17[6];
 
 	for (int v0 = 0; v0 <= 5; v0++) {
 		v1 = atol(_score[v0]._score.c_str());
@@ -1065,7 +1065,7 @@ void ComputerManager::saveScore() {
 		bool v3 = false;
 		do {
 			v4 = v17[v2];
-			if (v4 && v17[0] <= v4 && v17[1] <= v4 && v17[2] <= v4 && v17[3] <= v4 
+			if (v4 && v17[0] <= v4 && v17[1] <= v4 && v17[2] <= v4 && v17[3] <= v4
 					&& v17[4] <= v4 && v17[5] <= v4)
 				v3 = true;
 			if (v3) {
@@ -1110,8 +1110,8 @@ void ComputerManager::saveScore() {
  * Display parts of the hiscore line
  */
 void ComputerManager::displayHiscoreLine(byte *objectData, int x, int y, int a4) {
-	char v4; 
-	int v5; 
+	char v4;
+	int v5;
 
 	v4 = a4;
 	v5 = 36;
@@ -1134,11 +1134,11 @@ void ComputerManager::displayHiscoreLine(byte *objectData, int x, int y, int a4)
  * Handle ball moves
  */
 int ComputerManager::moveBall() {
-	int16 v1; 
+	int16 v1;
 	int16 v4 = 0;
 	//(signed int)(6.0 * (long double)_vm->getRandomNumber( rand() / 2147483648.0) + 1;
 	// TODO: Figure out random number
-	int v0 = _vm->getRandomNumber(6); 
+	int v0 = _vm->getRandomNumber(6);
 	if (_breakoutSpeed == 1) {
 		CASSEP1 = 1;
 		CASSEP2 = 1;
@@ -1166,7 +1166,7 @@ int ComputerManager::moveBall() {
 
 	if (_ballRightFl)
 		_ballPosition.x += v1;
-	else 
+	else
 		_ballPosition.x -= v1;
 
 	CASSDER = v1;
@@ -1222,12 +1222,12 @@ int ComputerManager::moveBall() {
  * Check ball collision with bricks
  */
 void ComputerManager::checkBallCollisions() {
-	int v1; 
-	int v2; 
-	int v3; 
-	int v4; 
-	int v10; 
-	int v11; 
+	int v1;
+	int v2;
+	int v3;
+	int v4;
+	int v10;
+	int v11;
 
 	int v7 = 0;
 	//v6 = (signed int)(6.0 * (long double)rand() / 2147483648.0) + 1;
diff --git a/engines/hopkins/debugger.h b/engines/hopkins/debugger.h
index 7a2f44aafe..aabc95c5f1 100644
--- a/engines/hopkins/debugger.h
+++ b/engines/hopkins/debugger.h
@@ -33,7 +33,7 @@ class HopkinsEngine;
 class Debugger : public GUI::Debugger {
 private:
 	HopkinsEngine *_vm;
-	
+
 public:
 	Debugger();
 	virtual ~Debugger() {}
diff --git a/engines/hopkins/detection_tables.h b/engines/hopkins/detection_tables.h
index ffb1164ed4..5c24935acf 100644
--- a/engines/hopkins/detection_tables.h
+++ b/engines/hopkins/detection_tables.h
@@ -170,6 +170,24 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			GUIO1(GUIO_NONE)
 		},
 	},
+
+	{
+		// Hopkins FBI BeOS, provided by Strangerke
+		{
+			"hopkins",
+			0,
+			{
+				{"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
+				{"Hopkins_ FBI", 0, "8940ce2e618c42691b66aad5d6c223b0", 757936},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformBeOS,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
+
 	{ AD_TABLE_END_MARKER }
 };
 
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 4072126508..e29592ad30 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -65,7 +65,7 @@ void DialogsManager::showOptionsDialog() {
 		_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "OPTIAN.SPR");
 	else if (_vm->_globals.FR == 2)
 		_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "OPTIES.SPR");
-  
+
 	_vm->_globals.OPTION_SPR = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
 	_vm->_globals._optionDialogFl = true;
 
@@ -74,13 +74,13 @@ void DialogsManager::showOptionsDialog() {
 			Common::Point mousePos(_vm->_eventsManager.getMouseX(), _vm->_eventsManager.getMouseY());
 			mousePos.x = _vm->_eventsManager.getMouseX();
 			mousePos.y = _vm->_eventsManager.getMouseY();
-	      
+
 			if (!_vm->_soundManager.MUSICOFF) {
 				if (mousePos.x >= _vm->_graphicsManager.ofscroll + 300 && mousePos.y > 113 && mousePos.x <= _vm->_graphicsManager.ofscroll + 327 && mousePos.y <= 138) {
 					// Change the music volume
 					++_vm->_soundManager.MUSICVOL;
 					_vm->_soundManager.OLD_MUSICVOL = _vm->_soundManager.MUSICVOL;
-	          
+
 					if (_vm->_soundManager.MUSICVOL <= 12)
 						_vm->_soundManager.PLAY_SOUND("bruit2.wav");
 					else
@@ -89,14 +89,14 @@ void DialogsManager::showOptionsDialog() {
 
 					_vm->_soundManager.updateScummVMSoundSettings();
 				}
-	        
+
 				if (!_vm->_soundManager.MUSICOFF && mousePos.x >= _vm->_graphicsManager.ofscroll + 331 && mousePos.y > 113 && mousePos.x <= _vm->_graphicsManager.ofscroll + 358 && mousePos.y <= 138) {
 					--_vm->_soundManager.MUSICVOL;
 					if (_vm->_soundManager.MUSICVOL >= 0)
 						_vm->_soundManager.PLAY_SOUND("bruit2.wav");
 					else
 						_vm->_soundManager.MUSICVOL = 0;
-				
+
 					_vm->_soundManager.OLD_MUSICVOL = _vm->_soundManager.MUSICVOL;
 					_vm->_soundManager.MODSetMusicVolume(_vm->_soundManager.MUSICVOL);
 
@@ -115,7 +115,7 @@ void DialogsManager::showOptionsDialog() {
 
 					_vm->_soundManager.updateScummVMSoundSettings();
 				}
-	        
+
 				if (!_vm->_soundManager.SOUNDOFF && mousePos.x >= _vm->_graphicsManager.ofscroll + 331 && mousePos.y > 140 && mousePos.x <= _vm->_graphicsManager.ofscroll + 358 && mousePos.y <= 165) {
 					--_vm->_soundManager.SOUNDVOL;
 					if (_vm->_soundManager.SOUNDVOL >= 0)
@@ -128,11 +128,11 @@ void DialogsManager::showOptionsDialog() {
 					_vm->_soundManager.updateScummVMSoundSettings();
 				}
 			}
-	      
+
 			if (!_vm->_soundManager.VOICEOFF) {
 				if (mousePos.x >= _vm->_graphicsManager.ofscroll + 300 && mousePos.y > 167 && mousePos.x <= _vm->_graphicsManager.ofscroll + 327 && mousePos.y <= 192) {
 					++_vm->_soundManager.VOICEVOL;
-	          
+
 					if (_vm->_soundManager.VOICEVOL <= 16)
 						_vm->_soundManager.PLAY_SOUND("bruit2.wav");
 					else
@@ -142,7 +142,7 @@ void DialogsManager::showOptionsDialog() {
 
 					_vm->_soundManager.updateScummVMSoundSettings();
 				}
-	        
+
 				if (!_vm->_soundManager.VOICEOFF && mousePos.x >= _vm->_graphicsManager.ofscroll + 331 && mousePos.y > 167 && mousePos.x <= _vm->_graphicsManager.ofscroll + 358 && mousePos.y <= 192) {
 					--_vm->_soundManager.VOICEVOL;
 					if (_vm->_soundManager.VOICEVOL >= 0)
@@ -155,7 +155,7 @@ void DialogsManager::showOptionsDialog() {
 					_vm->_soundManager.updateScummVMSoundSettings();
 				}
 			}
-	      
+
 			if (mousePos.x >= _vm->_graphicsManager.ofscroll + 431) {
 				if (mousePos.y > 194 && mousePos.x <= _vm->_graphicsManager.ofscroll + 489 && mousePos.y <= 219)
 					_vm->_soundManager.TEXTOFF = _vm->_soundManager.TEXTOFF != 1;
@@ -178,7 +178,7 @@ void DialogsManager::showOptionsDialog() {
 
 							_vm->_soundManager.updateScummVMSoundSettings();
 						}
-	        
+
 						if (mousePos.x >= _vm->_graphicsManager.ofscroll + 431 && mousePos.y > 140 && mousePos.x <= _vm->_graphicsManager.ofscroll + 489 && mousePos.y <= 165) {
 							_vm->_soundManager.SOUNDOFF = _vm->_soundManager.SOUNDOFF != 1;
 
@@ -187,7 +187,7 @@ void DialogsManager::showOptionsDialog() {
 					}
 				}
 			}
-	      
+
 			if (mousePos.x >= _vm->_graphicsManager.ofscroll + 175 && mousePos.y > 285 && mousePos.x <= _vm->_graphicsManager.ofscroll + 281 && mousePos.y <= 310) {
 				_vm->_globals.SORTIE = 300;
 				doneFlag = true;
@@ -256,7 +256,7 @@ void DialogsManager::showOptionsDialog() {
 		_vm->_globals.opt_voice = !_vm->_soundManager.VOICEOFF ? 7 : 8;
 		_vm->_globals.opt_sound = !_vm->_soundManager.SOUNDOFF ? 7 : 8;
 		_vm->_globals.opt_music = !_vm->_soundManager.MUSICOFF ? 7 : 8;
-			
+
 		if (_vm->_globals.SVGA == 1)
 			_vm->_globals.opt_anm = 10;
 		else if (_vm->_globals.SVGA == 2)
@@ -292,9 +292,9 @@ void DialogsManager::showOptionsDialog() {
 		_vm->_eventsManager.VBL();
 	} while (!doneFlag);
 
-	_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_graphicsManager.ofscroll + 164, 
+	_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_graphicsManager.ofscroll + 164,
 		107, 335, 215, _vm->_graphicsManager.VESA_BUFFER, _vm->_graphicsManager.ofscroll + 164, 107);
-	_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_graphicsManager.ofscroll + 164, 107, 
+	_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_graphicsManager.ofscroll + 164, 107,
 		_vm->_graphicsManager.ofscroll + 498, 320);
 
 	_vm->_globals.OPTION_SPR = _vm->_globals.freeMemory(_vm->_globals.OPTION_SPR);
@@ -349,7 +349,7 @@ LABEL_7:
 		int v18 = _inventWidth = _vm->_objectsManager.getWidth(_vm->_dialogsManager._inventWin1, 0);
 		int v17 = _inventHeight = _vm->_objectsManager.getHeight(_vm->_dialogsManager._inventWin1, 0);
 
-		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager._inventWin1, 
+		_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager._inventWin1,
 			v19 + 300, 414, 0, 0, 0, 0);
 		int v15 = 0;
 		int v4 = 0;
@@ -360,7 +360,7 @@ LABEL_7:
 				int v6 = _vm->_globals.INVENTAIRE[v4];
 				if (v6 && v4 <= 29) {
 					byte *v7 = _vm->_objectsManager.CAPTURE_OBJET(v6, 0);
-					_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, v7, v19 + v16 + 6, 
+					_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, v7, v19 + v16 + 6,
 						v15 + 120, _vm->_globals.OBJL, _vm->_globals.OBJH);
 					_vm->_globals.freeMemory(v7);
 				}
@@ -476,18 +476,18 @@ LABEL_7:
 void DialogsManager::inventAnim() {
 	if (!_vm->_globals._disableInventFl) {
 		if (_vm->_objectsManager.FLAG_VISIBLE_EFFACE && !_vm->_objectsManager.FLAG_VISIBLE) {
-			_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_objectsManager.I_old_x, 27, 48, 38, 
+			_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_objectsManager.I_old_x, 27, 48, 38,
 				_vm->_graphicsManager.VESA_BUFFER, _vm->_objectsManager.I_old_x, 27);
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_objectsManager.I_old_x, 27, _vm->_objectsManager.I_old_x + 48, 65);
 			--_vm->_objectsManager.FLAG_VISIBLE_EFFACE;
 		}
-    
+
 		if (_vm->_objectsManager.FLAG_VISIBLE) {
 			if (_vm->_objectsManager.I_old_x <= 1)
 				_vm->_objectsManager.I_old_x = 2;
-			_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_objectsManager.I_old_x, 27, 48, 38, 
+			_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, _vm->_objectsManager.I_old_x, 27, 48, 38,
 				_vm->_graphicsManager.VESA_BUFFER, _vm->_objectsManager.I_old_x, 27);
-      
+
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_objectsManager.I_old_x, 27, _vm->_objectsManager.I_old_x + 48, 65);
 			int v0 = _vm->_graphicsManager.ofscroll + 2;
 			int v1 = _vm->_graphicsManager.ofscroll + 2;
@@ -495,7 +495,7 @@ void DialogsManager::inventAnim() {
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(v1, 27, v1 + 45, 62);
 			_vm->_objectsManager.I_old_x = v0;
 		}
-    
+
 		if (_vm->_globals.SAUVEGARDE->data[svField357] == 1) {
 			if (_vm->_globals.SAUVEGARDE->data[svField353] == 1)
 				_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.TETE, 832, 325, 0, 0, 0, 0);
@@ -522,7 +522,7 @@ void DialogsManager::inventAnim() {
 void DialogsManager::testDialogOpening() {
 	if (_vm->_globals.PLAN_FLAG)
 		_vm->_eventsManager._gameKey = KEY_NONE;
-	
+
 	if (_vm->_eventsManager._gameKey != KEY_NONE) {
 		if (!_inventFl) {
 			DIALOG_KEY key = _vm->_eventsManager._gameKey;
@@ -562,7 +562,7 @@ void DialogsManager::testDialogOpening() {
  * Load Game dialog
  */
 void DialogsManager::showLoadGame() {
-	int slotNumber; 
+	int slotNumber;
 
 	_vm->_eventsManager.VBL();
 	showSaveLoad(2);
@@ -584,7 +584,7 @@ void DialogsManager::showLoadGame() {
 	if (slotNumber != 7) {
 		_vm->_saveLoadManager.restore(slotNumber);
 	}
-	
+
 	_vm->_objectsManager.CHANGE_OBJET(14);
 }
 
@@ -592,8 +592,8 @@ void DialogsManager::showLoadGame() {
  * Save Game dialog
  */
 void DialogsManager::showSaveGame() {
-	int slotNumber; 
-	Common::String saveName; 
+	int slotNumber;
+	Common::String saveName;
 
 	_vm->_eventsManager.VBL();
 
@@ -627,7 +627,7 @@ void DialogsManager::showSaveGame() {
  * Load/Save dialog
  */
 void DialogsManager::showSaveLoad(int a1) {
-	int slotNumber; 
+	int slotNumber;
 	hopkinsSavegameHeader header;
 	byte *thumb;
 
@@ -687,7 +687,7 @@ void DialogsManager::showSaveLoad(int a1) {
 				_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, thumb, _vm->_eventsManager._startPos.x + 323, 294, 0x80u, 87);
 				break;
 			}
-			
+
 			thumb8.free();
 			header.thumbnail->free();
 			delete header.thumbnail;
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index b0be096dc6..2f3dc413df 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -148,7 +148,7 @@ void EventsManager::changeMouseCursor(int id) {
 			cursorId = 0;
 		if (cursorId == 25)
 			cursorId = 5;
-    
+
 		if (_oldIconId != cursorId || !cursorId) {
 			_oldIconId = cursorId;
 			_mouseSpriteId = cursorId;
@@ -191,7 +191,7 @@ void EventsManager::delay(int totalMilli) {
 
 	while (!g_system->getEventManager()->shouldQuit() && g_system->getMillis() < delayEnd) {
 		g_system->delayMillis(10);
-	}	
+	}
 }
 
 void EventsManager::pollEvents() {
@@ -236,7 +236,7 @@ void EventsManager::pollEvents() {
 
 void EventsManager::handleKey(Common::Event &event) {
 	_escKeyFl = (event.kbd.keycode == Common::KEYCODE_ESCAPE);
-	
+
 	if (event.kbd.keycode == Common::KEYCODE_i || event.kbd.keycode == Common::KEYCODE_TAB)
 		_gameKey = KEY_INVENTORY;
 	else if (event.kbd.keycode == Common::KEYCODE_F5)
@@ -306,13 +306,13 @@ int EventsManager::waitKeyPress() {
 
 void EventsManager::VBL() {
 	int v1;
-	int v2; 
-	int v3; 
+	int v2;
+	int v3;
 	signed int v11 = 0;
 	signed int v12 = 0;
-	int v13 = 0; 
-	unsigned int v14 = 0; 
-	int v15 = 0; 
+	int v13 = 0;
+	unsigned int v14 = 0;
+	int v15 = 0;
 	int yp = 0;
 
 	if (_vm->_graphicsManager.REDRAW) {
@@ -438,7 +438,7 @@ LABEL_65:
 	if (_vm->_graphicsManager.DOUBLE_ECRAN != true || _vm->_graphicsManager.no_scroll == 1) {
 		_vm->_graphicsManager.Affiche_Segment_Vesa();
 	} else {
-		int v4; 
+		int v4;
 		if (_vm->_graphicsManager.no_scroll != 2) {
 			if (getMouseX() > _vm->_graphicsManager.SCROLL + 620)
 				_vm->_graphicsManager.SCROLL += _vm->_graphicsManager.SPEED_SCROLL;
@@ -529,7 +529,7 @@ LABEL_113:
 #endif
 	_vm->_soundManager.VERIF_SOUND();
 	refreshEvents();
-}	
+}
 
 void EventsManager::updateCursor() {
 	// Backup the current sprite clipping bounds and reset them
@@ -559,7 +559,7 @@ void EventsManager::updateCursor() {
 	_vm->_graphicsManager.max_x = clipBounds.right;
 	_vm->_graphicsManager.max_y = clipBounds.bottom;
 	_vm->_graphicsManager.nbrligne2 = pitch;
-	
+
 	// Convert the cursor to the pixel format. At the moment, it's hardcoded
 	// to expect the game to be in 16-bit mode
 	uint16 *cursorPixels = new uint16[_vm->_globals.OBJH * _vm->_globals.OBJL];
@@ -585,7 +585,7 @@ void EventsManager::updateCursor() {
 	CursorMan.replaceCursor(cursorPixels, _vm->_globals.OBJL, _vm->_globals.OBJH,
 		xOffset, 0, *((uint16 *)cursorPixels), true, &pixelFormat);
 
-	// Delete the cursor surface 
+	// Delete the cursor surface
 	delete[] cursorPixels;
 	delete[] cursorSurface;
 }
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp
index 998ab57fc5..04d4dab3cd 100644
--- a/engines/hopkins/files.cpp
+++ b/engines/hopkins/files.cpp
@@ -42,7 +42,7 @@ void FileManager::setParent(HopkinsEngine *vm) {
  * Load INI File
  */
 void FileManager::loadIniFile(Common::StringMap &iniParams) {
-	// TODO: Review whether we can do something cleaner with ScummVM initialisation than 
+	// TODO: Review whether we can do something cleaner with ScummVM initialisation than
 	// just initialising the INI array as if it had read in the INI file
 
 	iniParams["FULLSCREEN"] = "NO";
@@ -70,7 +70,7 @@ byte *FileManager::loadFile(const Common::String &file) {
 
 	readStream(f, data, filesize);
 	f.close();
-  
+
 	return data;
 }
 
@@ -146,7 +146,7 @@ Common::String FileManager::constructLinuxFilename(const Common::String &file) {
  * Check if a file is present in a given (optional) folder
  */
 bool FileManager::fileExists(const Common::String &folder, const Common::String &file) {
-	Common::String filename = folder.empty() ? file : 
+	Common::String filename = folder.empty() ? file :
 		Common::String::format("%s/%s", folder.c_str(), file.c_str());
 
 	Common::File f;
@@ -159,7 +159,7 @@ bool FileManager::fileExists(const Common::String &folder, const Common::String
 byte *FileManager::searchCat(const Common::String &file, int a2) {
 	byte *ptr = NULL;
 	Common::File f;
-	
+
 	Common::String filename = file;
 	filename.toUppercase();
 
@@ -168,7 +168,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
 		if (!f.exists(_vm->_globals.NFICHIER))
 			return g_PTRNUL;
-		
+
 		ptr = loadFile(_vm->_globals.NFICHIER);
 		constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
 		break;
@@ -260,10 +260,10 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 	byte *result;
 	bool matchFlag = false;
 	int offsetVal = 0;
-	
+
 	while (!matchFlag) {
 		Common::String name = (const char *)ptr + offsetVal;
-    
+
 		if (name == filename) {
 			// Found entry for file, so get it's details from the catalogue entry
 			const byte *pData = ptr + offsetVal;
@@ -276,7 +276,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
 			_vm->_globals.freeMemory(ptr);
 			return g_PTRNUL;
 		}
-    
+
 		offsetVal += 23;
 	}
 
@@ -315,7 +315,7 @@ uint32 FileManager::fileSize(const Common::String &filename) {
 
 	size = f.size();
 	f.close();
-	
+
 	return size;
 }
 
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index cc5f2c05a6..92d0c72263 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -56,7 +56,7 @@ void FontManager::clearAll() {
 
 	_oldName = Common::String("");
 	_indexName = Common::String("");
-	
+
 	for (int idx = 0; idx < 4048; idx++)
 		_index[idx] = 0;
 
@@ -69,11 +69,11 @@ void FontManager::clearAll() {
 void FontManager::showText(int idx) {
 	if ((idx - 5) > MAX_TEXT)
 		error("Attempted to display text > MAX_TEXT.");
-  
+
 	TxtItem &txt = _text[idx - 5];
 	txt._textOnFl = true;
 	txt._textLoadedFl = false;
-  
+
 	txt._textBlock = _vm->_globals.freeMemory(txt._textBlock);
 }
 
@@ -83,7 +83,7 @@ void FontManager::showText(int idx) {
 void FontManager::hideText(int idx) {
 	if ((idx - 5) > MAX_TEXT)
 			error("Attempted to display text > MAX_TEXT.");
-  
+
 	TxtItem &txt = _text[idx - 5];
 	txt._textOnFl = false;
 	txt._textLoadedFl = false;
@@ -113,7 +113,7 @@ void FontManager::setOptimalColor(int idx1, int idx2, int idx3, int idx4) {
 void FontManager::initTextBuffers(int idx, int messageId, const Common::String &filename, int xp, int yp, int a6, int a7, int textType, int a9, int color) {
 	if ((idx - 5) > MAX_TEXT)
 		error("Attempted to display text > MAX_TEXT.");
-  
+
 	TxtItem &txt = _text[idx - 5];
 	txt._textOnFl = false;
 	txt._filename = filename;
@@ -129,10 +129,10 @@ void FontManager::initTextBuffers(int idx, int messageId, const Common::String &
 
 // Box
 void FontManager::box(int idx, int messageId, const Common::String &filename, int xp, int yp) {
-	byte *v9; 
-	byte *ptre; 
-	Common::String s; 
-	Common::String file; 
+	byte *v9;
+	byte *ptre;
+	Common::String s;
+	Common::String file;
 	Common::File f;
 
 	int v73 = xp;
@@ -150,7 +150,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
 				for (int lineNum = 0; lineNum < _text[idx]._lineCount; ++lineNum) {
 					displayText(xp + 5, yCurrent, _text[idx]._lines[lineNum], _text[idx]._color);
 					yCurrent += _vm->_globals.police_h + 1;
-				} 
+				}
 			}
 		} else {
 			int height = _text[idx]._height;
@@ -179,7 +179,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
 			_oldName = file;
 			_indexName = Common::String(file.c_str(), file.size() - 3);
 			_indexName += "IND";
-			
+
 			if (!f.open(_indexName))
 				error("Error opening file - %s", _indexName.c_str());
 			int filesize = f.size();
@@ -198,7 +198,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
 			_tempText = _vm->_globals.allocMemory(0x80Au);
 			if (_tempText == g_PTRNUL)
 				error("Error allocating text");
-			
+
 			Common::fill(&_tempText[0], &_tempText[0x80a], 0);
 			f.read(_tempText, 0x800u);
 			f.close();
@@ -398,7 +398,7 @@ LABEL_57:
 			_vm->_graphicsManager.Trans_bloc2(ptrd, _vm->_graphicsManager.TABLE_COUL, v49);
 			_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, ptrd, v56, v55, v53, v51);
 			_vm->_globals.freeMemory(ptrd);
-			
+
 			_vm->_graphicsManager.Plot_Hline(_vm->_graphicsManager.VESA_BUFFER, v56, v55, v53, (byte)-2);
 			_vm->_graphicsManager.Plot_Hline(_vm->_graphicsManager.VESA_BUFFER, v56, v51 + v55, v53, (byte)-2);
 			_vm->_graphicsManager.Plot_Vline(_vm->_graphicsManager.VESA_BUFFER, v56, v70, v51, (byte)-2);
@@ -417,7 +417,7 @@ LABEL_57:
 
 		int blockWidth = v53 + 1;
 		int blockHeight = v51 + 1;
-		
+
 		_text[idx]._width = blockWidth;
 		_text[idx]._height = blockHeight;
 		textType = _text[idx]._textType;
@@ -437,13 +437,13 @@ LABEL_57:
 	}
 }
 
-/** 
+/**
  * Directly display text (using a VESA segment)
  */
 void FontManager::displayTextVesa(int xp, int yp, const Common::String &message, int col) {
 	const char *srcP;
-	char currChar; 
-	int charIndex; 
+	char currChar;
+	int charIndex;
 	int currentX = xp;
 
 	srcP = message.c_str();
@@ -453,7 +453,7 @@ void FontManager::displayTextVesa(int xp, int yp, const Common::String &message,
 			break;
 		if (currChar >= 32) {
 			charIndex = currChar - 32;
-			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police, 
+			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police,
 				currentX, yp, currChar - 32, col);
 			currentX += _vm->_objectsManager.getWidth(_vm->_globals.police, charIndex);
 		}
@@ -462,7 +462,7 @@ void FontManager::displayTextVesa(int xp, int yp, const Common::String &message,
 	_vm->_graphicsManager.Ajoute_Segment_Vesa(xp, yp, currentX, yp + 12);
 }
 
-/** 
+/**
  * Directly display text
  */
 void FontManager::displayText(int xp, int yp, const Common::String &message, int col) {
@@ -471,7 +471,7 @@ void FontManager::displayText(int xp, int yp, const Common::String &message, int
 
 		if (currentChar > 31) {
 			int characterIndex = currentChar - 32;
-			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police, 
+			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.police,
 				xp, yp, characterIndex, col);
 			xp += _vm->_objectsManager.getWidth(_vm->_globals.police, characterIndex);
 		}
@@ -479,12 +479,12 @@ void FontManager::displayText(int xp, int yp, const Common::String &message, int
 }
 
 void FontManager::TEXT_COMPUT(int xp, int yp, const Common::String &msg, int col) {
-	const char *srcP; 
-	int v5; 
-	int v6; 
-	byte v7; 
-	int fontCol; 
-	int v9; 
+	const char *srcP;
+	int v5;
+	int v6;
+	byte v7;
+	int fontCol;
+	int v9;
 
 	srcP = msg.c_str();
 	v9 = xp;
diff --git a/engines/hopkins/font.h b/engines/hopkins/font.h
index dbe6a2dc67..1b9bd3404f 100644
--- a/engines/hopkins/font.h
+++ b/engines/hopkins/font.h
@@ -81,7 +81,7 @@ public:
 	void setOptimalColor(int idx1, int idx2, int idx3, int idx4);
 	void initTextBuffers(int idx, int messageId, const Common::String &filename, int xp, int yp, int a6, int a7, int textType, int a9, int a10);
 	void box(int idx, int messageId, const Common::String &filename, int xp, int yp);
-	
+
 	void displayTextVesa(int xp, int yp, const Common::String &message, int col);
 	void displayText(int xp, int yp, const Common::String &message, int col);
 	void TEXT_COMPUT(int xp, int yp, const Common::String &msg, int col);
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index ed4e998df3..e13a184d5e 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -37,26 +37,26 @@ byte *g_PTRNUL;
 // Default data for the Hopkins array
 
 const int HOPKINS_PERSO_0[] = {
-		0, -2, 0, -3, 0, -6, 0, -1, 0, -3, 0, -3, 0, -5, 0, -3, 0, -6, 0, -3, 0, -3, 0, -3, 
-		9, -4, 8, -4, 6, -2, 9, -2, 9, -3, 9, -3, 9, -4, 9, -2, 9, -2, 8, -2, 9, -3, 9, -2, 
-		13, 0, 13, 0, 13, 0, 13, 0, 14, 0, 13, 0, 13, 0, 12, 0, 12, 0, 14, 0, 13, 0, 14, 0, 
-		10, 3, 9, 3, 10, 4, 8, 2, 7, 1, 10, 2, 9, 2, 7, 4, 7, 3, 8, 0, 9, 1, 9, 1, 0, 4, 0, 
+		0, -2, 0, -3, 0, -6, 0, -1, 0, -3, 0, -3, 0, -5, 0, -3, 0, -6, 0, -3, 0, -3, 0, -3,
+		9, -4, 8, -4, 6, -2, 9, -2, 9, -3, 9, -3, 9, -4, 9, -2, 9, -2, 8, -2, 9, -3, 9, -2,
+		13, 0, 13, 0, 13, 0, 13, 0, 14, 0, 13, 0, 13, 0, 12, 0, 12, 0, 14, 0, 13, 0, 14, 0,
+		10, 3, 9, 3, 10, 4, 8, 2, 7, 1, 10, 2, 9, 2, 7, 4, 7, 3, 8, 0, 9, 1, 9, 1, 0, 4, 0,
 		4, 0, 6, 0, 3, 0, 4, 0, 3, 0, 4, 0, 4, 0, 6, 0, 3, 0, 3, 0, 3
 };
 
 const int HOPKINS_PERSO_1[] = {
-		0, -2, 0, -2, 0, -5, 0, -1, 0, -2, 0, -2, 0, -4, 0, -2, 0, -5, 0, -2, 0, -2, 0, -2, 
-		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0, 
-		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0, 
-		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0, 
+		0, -2, 0, -2, 0, -5, 0, -1, 0, -2, 0, -2, 0, -4, 0, -2, 0, -5, 0, -2, 0, -2, 0, -2,
+		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0,
+		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0,
+		11, 0, 10, 0, 11, 0, 11, 0, 11, 0, 11, 0, 12, 0, 11, 0, 9, 0, 10, 0, 11, 0, 11, 0,
 		0, 3, 0, 3, 0, 5, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 5, 0, 3, 0, 3, 0, 3
 };
 
 const int HOPKINS_PERSO_2[] = {
-		0, -2, 0, 0, 0, -3, 0, -2, 0, -2, 0, -1, 0, -2, 0, -1, 0, -3, 0, -2, 0, -2, 0, -2, 
-		8, 0, 9, 0, 5, 0, 9, 0, 7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 8, 0, 9, 0, 
-		5, 0, 9, 0, 7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 8, 0, 9, 0, 5, 0, 9, 0, 
-		7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0, 2, 0, 2, 
+		0, -2, 0, 0, 0, -3, 0, -2, 0, -2, 0, -1, 0, -2, 0, -1, 0, -3, 0, -2, 0, -2, 0, -2,
+		8, 0, 9, 0, 5, 0, 9, 0, 7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 8, 0, 9, 0,
+		5, 0, 9, 0, 7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 8, 0, 9, 0, 5, 0, 9, 0,
+		7, 0, 7, 0, 7, 0, 7, 0, 6, 0, 7, 0, 6, 0, 9, 0, 0, 2, 0, 0, 0, 2, 0, 1, 0, 2, 0, 2,
 		0, 2, 0, 2, 0, 2, 0, 1, 0, 2, 0, 2
 };
 
@@ -346,13 +346,13 @@ void Globals::setConfig() {
 void Globals::clearAll() {
 	// TODO: The original allocated an explicit memory block for the null pointer
 	// to point to. For now, we're seeing if the NULL value will do as well
-	
+
 	for (int idx = 0; idx < 6; ++idx)
 		CACHE_BANQUE[idx] = g_PTRNUL;
 
 	nbrligne = 80;
 	INIT_ANIM();
-  
+
 	texte_tmp = g_PTRNUL;
 	texte_long = 0;
 	police = g_PTRNUL;
@@ -360,7 +360,7 @@ void Globals::clearAll() {
 	police_l = 0;
 	hauteur_boite = 0;
 	largeur_boite = 0;
-	
+
 	_vm->_fontManager.clearAll();
 
 	INIT_VBOB();
@@ -374,7 +374,7 @@ void Globals::clearAll() {
 	SPRITE_ECRAN = g_PTRNUL;
 	SAUVEGARDE = (Sauvegarde *)g_PTRNUL;
 	OBJET_EN_COURS = 0;
-  
+
 	for (int idx = 0; idx < 105; ++idx) {
 		ZONEP[idx].destX = 0;
 		ZONEP[idx].destY = 0;
@@ -484,7 +484,7 @@ void Globals::CLEAR_VBOB() {
 		VBob[idx].surface = freeMemory(VBob[idx].surface);
 		VBob[idx].spriteData = g_PTRNUL;
 		VBob[idx].oldSpriteData = g_PTRNUL;
-	} 
+	}
 }
 
 // Load Object
@@ -563,8 +563,8 @@ void Globals::CACHE_ADD(int idx) {
 // Load Cache
 void Globals::CHARGE_CACHE(const Common::String &file) {
 	byte *v2 = g_PTRNUL;
-	byte *spriteData; 
-	byte *ptr; 
+	byte *spriteData;
+	byte *ptr;
 	Common::String v16;
 	Common::File f;
 
@@ -574,7 +574,7 @@ void Globals::CHARGE_CACHE(const Common::String &file) {
 	v16 = Common::String((const char *)ptr);
 
 	_vm->_fileManager.constructFilename(HOPLINK, v16);
-	
+
 	if (f.exists(NFICHIER)) {
 		spriteData = _vm->_fileManager.loadFile(NFICHIER);
 		CACHE_BANQUE[1] = spriteData;
@@ -599,7 +599,7 @@ void Globals::CHARGE_CACHE(const Common::String &file) {
 				Cache[i].field8 = v9;
 				Cache[i].fieldA = 1;
 			}
-      
+
 			if ( !Cache[i].field0 && !Cache[i].field4 && !Cache[i].field2)
 				Cache[i].fieldA = 0;
 			v15 += 5;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index eebfea5782..803a63384a 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -503,9 +503,9 @@ public:
 	byte *freeMemory(byte *p);
 
 	void RESET_CACHE();
-	void CACHE_ON(); 
+	void CACHE_ON();
 	void CACHE_OFF(int v1 = 0);
-	void CACHE_SUB(int idx); 
+	void CACHE_SUB(int idx);
 	void CACHE_ADD(int idx);
 	void CHARGE_CACHE(const Common::String &file);
 	void B_CACHE_OFF(int idx);
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 32b7b62688..3dbd97a9da 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -91,7 +91,7 @@ void GraphicsManager::setParent(HopkinsEngine *vm) {
 		if (_vm->getPlatform() == Common::kPlatformLinux)
 		// CHECKME: Should be 0?
 			MANU_SCROLL = 1;
-		else 
+		else
 			MANU_SCROLL = 0;
 		SPEED_SCROLL = 16;
 	} else {
@@ -114,7 +114,7 @@ void GraphicsManager::SET_MODE(int width, int height) {
 			SDL_ECHELLE = 75;
 		if (_vm->_globals.XSETMODE == 5)
 			SDL_ECHELLE = _vm->_globals.XZOOM;
-		
+
 		int bpp = 8;
 		if (_vm->_globals.XFORCE8 == true)
 			bpp = 8;
@@ -202,7 +202,7 @@ void GraphicsManager::LOAD_IMAGEVGA(const Common::String &file) {
 	if (Winbpp == 2)
 		CopyAsm16(VESA_BUFFER);
 	DD_Unlock();
-	
+
 	FADE_IN_CASSE();
 }
 
@@ -241,7 +241,7 @@ void GraphicsManager::CHARGE_ECRAN(const Common::String &file) {
 		} else if (Winbpp == 1) {
 			if (!SDL_ECHELLE)
 				m_scroll2(VESA_SCREEN, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
-			else 
+			else
 				m_scroll2A(VESA_SCREEN, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
 		}
 
@@ -278,7 +278,7 @@ void GraphicsManager::CHARGE_ECRAN(const Common::String &file) {
 void GraphicsManager::INIT_TABLE(int minIndex, int maxIndex, byte *palette) {
 	for (int idx = 0; idx < 256; ++idx)
 		TABLE_COUL[idx] = idx;
-  
+
 	Trans_bloc(TABLE_COUL, palette, 256, minIndex, maxIndex);
 
 	for (int idx = 0; idx < 256; ++idx) {
@@ -320,7 +320,7 @@ void GraphicsManager::Trans_bloc(byte *destP, const byte *srcP, int count, int m
 			col2 += minThreshold;
 			if (col2 < col1)
 				continue;
-			
+
 			col2 -= maxThreshold;
 			if (col2 > col1)
 				continue;
@@ -332,9 +332,9 @@ void GraphicsManager::Trans_bloc(byte *destP, const byte *srcP, int count, int m
 }
 
 void GraphicsManager::Trans_bloc2(byte *surface, byte *col, int size) {
-	byte *dataP; 
-	int count; 
-	byte dataVal; 
+	byte *dataP;
+	int count;
+	byte dataVal;
 
 	dataP = surface;
 	count = size - 1;
@@ -372,7 +372,7 @@ void GraphicsManager::A_PCX640_480(byte *surface, const Common::String &file, by
 		error("Error decoding PCX %s", file.c_str());
 
 	const Graphics::Surface *s = pcxDecoder.getSurface();
-	
+
 	// Copy out the dimensions and pixels of the decoded surface
 	DOUBLE_ECRAN = s->w > SCREEN_WIDTH;
 	PCX_L = s->w;
@@ -382,28 +382,28 @@ void GraphicsManager::A_PCX640_480(byte *surface, const Common::String &file, by
 	// Copy out the palette
 	const byte *palSrc = pcxDecoder.getPalette();
 	Common::copy((const byte *)palSrc, (const byte *)palSrc + PALETTE_BLOCK_SIZE, palette);
-  
+
 	f.close();
 }
 
 void GraphicsManager::A_PCX320(byte *surface, const Common::String &file, byte *palette) {
-	size_t filesize; 
-	int v4; 
-	size_t v5; 
-	int v6; 
-	size_t v7; 
-	int v8; 
-	byte v9; 
-	int v10; 
-	int v11; 
-	char v12; 
-	int v15; 
-	int v16; 
-	int32 v17; 
-	byte *ptr; 
-	Common::File f; 
-
-	if (!f.open(file)) 
+	size_t filesize;
+	int v4;
+	size_t v5;
+	int v6;
+	size_t v7;
+	int v8;
+	byte v9;
+	int v10;
+	int v11;
+	char v12;
+	int v15;
+	int v16;
+	int32 v17;
+	byte *ptr;
+	Common::File f;
+
+	if (!f.open(file))
 		error("File not found - %s", file.c_str());
 
 	filesize = f.size();
@@ -562,7 +562,7 @@ void GraphicsManager::m_scroll2A(const byte *surface, int xs, int ys, int width,
 				}
 				--xCtr;
 			} while ( xCtr );
-	      
+
 			srcP = srcCopyP;
 			destP = WinScan + destCopyP;
 			if (Agr_Flag_y)
@@ -648,7 +648,7 @@ void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width
 					*(uint16 *)destP = pixelWord;
 					destP += 2;
 				}
-        
+
 				--xCtr;
 			} while (xCtr);
 
@@ -657,12 +657,12 @@ void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width
 			destP = WinScan + destCopyP;
 			if (Agr_Flag_y == 1)
 				break;
-			
+
 			Agr_y += SDL_ECHELLE;
-			
+
 			if ((unsigned int)Agr_y < 100)
 				break;
-      
+
 			Agr_y -= 100;
 			Agr_Flag_y = 1;
 		}
@@ -679,18 +679,18 @@ void GraphicsManager::Copy_Vga(const byte *surface, int xp, int yp, int width, i
 	int yCount;
 	int xCount;
 	byte srcByte;
-	byte *loopDestP; 
-	byte *loopSrcP; 
-	byte *loopSrc2P; 
-	byte *tempDestP; 
-	const byte *tempSrcP; 
-	int yCtr; 
+	byte *loopDestP;
+	byte *loopSrcP;
+	byte *loopSrc2P;
+	byte *tempDestP;
+	const byte *tempSrcP;
+	int yCtr;
 
 	assert(VideoPtr);
 	srcP = xp + 320 * yp + surface;
 	destP = 30 * WinScan + destX + destX + WinScan * 2 * destY + (byte *)VideoPtr->pixels;
 	yCount = height;
-  
+
 	do {
 		yCtr = yCount;
 		xCount = width;
@@ -709,7 +709,7 @@ void GraphicsManager::Copy_Vga(const byte *surface, int xp, int yp, int width, i
 			destP = loopSrc2P - WinScan + 1;
 			--xCount;
 		} while (xCount);
-    
+
 		destP = WinScan + WinScan + tempDestP;
 		srcP = tempSrcP + 320;
 		yCount = yCtr - 1;
@@ -717,9 +717,9 @@ void GraphicsManager::Copy_Vga(const byte *surface, int xp, int yp, int width, i
 }
 
 void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width, int height, int destX, int destY) {
-	const byte *srcP; 
-	uint16 *destP; 
-	int yCount; 
+	const byte *srcP;
+	uint16 *destP;
+	int yCount;
 	int xCount;
 	int xCtr;
 	const byte *palette;
@@ -736,7 +736,7 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width,
 	destP = (uint16 *)(30 * WinScan + destX + destX + destX + destX + WinScan * 2 * destY + (byte *)VideoPtr->pixels);
 	yCount = height;
 	xCount = width;
-  
+
 	do {
 		yCtr = yCount;
 		xCtr = xCount;
@@ -744,13 +744,13 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width,
 		loopDestP = destP;
 		savedXCount = xCount;
 		palette = PAL_PIXELS;
-		
+
 		do {
 			tempSrcP = (uint16 *)(palette + 2 * *srcP);
 			srcByte = *tempSrcP;
 			*destP = *tempSrcP;
 			*(destP + 1) = srcByte;
-			
+
 			tempDestP = (uint16 *)((byte *)destP + WinScan);
 			*tempDestP = srcByte;
 			*(tempDestP + 1) = srcByte;
@@ -758,7 +758,7 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width,
 			destP = (uint16 *)((byte *)tempDestP - WinScan + 4);
 			--xCtr;
 		} while (xCtr);
-    
+
 		xCount = savedXCount;
 		destP = (uint16 *)((byte *)loopDestP + WinScan * 2);
 		srcP = loopSrcP + 320;
@@ -776,7 +776,7 @@ void GraphicsManager::fade_in(const byte *palette, int step, const byte *surface
 
 	// Set current palette to black
 	setpal_vga256(palData2);
-  
+
 	// Loop through fading in the palette
 	uint16 *pTemp1 = &palData1[1];
 	for (int fadeIndex = 0; fadeIndex < FADESPD; ++fadeIndex) {
@@ -791,14 +791,14 @@ void GraphicsManager::fade_in(const byte *palette, int step, const byte *surface
 
 			if (palData2[palOffset + 1] < palette[palOffset + 1]) {
 				uint16 *pDest = &pTemp1[palOffset];
-				uint16 v = (palette[palOffset] & 0xff) * 256 / FADESPD + *pDest; 
+				uint16 v = (palette[palOffset] & 0xff) * 256 / FADESPD + *pDest;
 				*pDest = v;
 				palData2[palOffset + 1] = (v >> 8) & 0xff;
 			}
 
 			if (palData2[palOffset + 2] < palette[palOffset + 2]) {
 				uint16 *pDest = &pTemp2[palOffset];
-				uint16 v = (palette[palOffset] & 0xff) * 256 / FADESPD + *pDest; 
+				uint16 v = (palette[palOffset] & 0xff) * 256 / FADESPD + *pDest;
 				*pDest = v;
 				palData2[palOffset + 2] = (v >> 8) & 0xff;
 			}
@@ -843,7 +843,7 @@ void GraphicsManager::fade_out(const byte *palette, int step, const byte *surfac
 			tempPalette[palDataIndex] = palByte;
 			palData[palDataIndex] = *(palIndex++ + palette);
 		} while (palIndex < PALETTE_BLOCK_SIZE);
-    
+
 		setpal_vga256(palData);
 		if (Winbpp == 2) {
 			if (SDL_ECHELLE)
@@ -852,7 +852,7 @@ void GraphicsManager::fade_out(const byte *palette, int step, const byte *surfac
 				m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
 			DD_VBL();
 		}
-	
+
 		int palCtr3 = 0;
 		if (palMax > 0) {
 			do {
@@ -864,14 +864,14 @@ void GraphicsManager::fade_out(const byte *palette, int step, const byte *surfac
 					palData[palCtr5] = (palValue >> 8) & 0xff;
 					++palCtr4;
 				} while (palCtr4 < (PALETTE_BLOCK_SIZE));
-				
+
 				setpal_vga256(palData);
 				if (Winbpp == 2) {
 					if (SDL_ECHELLE)
 						m_scroll16A(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
 					else
 						m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
-			
+
 					DD_VBL();
 				}
 				++palCtr3;
@@ -882,7 +882,7 @@ void GraphicsManager::fade_out(const byte *palette, int step, const byte *surfac
 			palData[i] = 0;
 
 		setpal_vga256(palData);
-    
+
 		if (Winbpp == 2) {
 			if (!SDL_ECHELLE) {
 				m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
@@ -934,13 +934,13 @@ void GraphicsManager::setpal_vga256(const byte *palette) {
 
 void GraphicsManager::setpal_vga256_linux(const byte *palette, const byte *surface) {
 	CHANGE_PALETTE(palette);
-  
+
 	if (Winbpp == 2) {
 		if (SDL_ECHELLE)
 			m_scroll16A(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
 		else
 			m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
-		
+
 		DD_VBL();
 	}
 }
@@ -949,7 +949,7 @@ void GraphicsManager::SETCOLOR(int palIndex, int r, int g, int b) {
 	Palette[palIndex * 3] = 255 * r / 100;
 	Palette[palIndex * 3 + 1] = 255 * g / 100;
 	Palette[palIndex * 3 + 2] = 255 * b / 100;
-	
+
 	setpal_vga256(Palette);
 }
 
@@ -965,8 +965,8 @@ void GraphicsManager::SETCOLOR3(int palIndex, int r, int g, int b) {
 
 void GraphicsManager::SETCOLOR4(int palIndex, int r, int g, int b) {
 	int rv, gv, bv;
-	int palOffset; 
-	int v8; 
+	int palOffset;
+	int v8;
 
 	rv = 255 * r / 100;
 	gv = 255 * g / 100;
@@ -980,9 +980,9 @@ void GraphicsManager::SETCOLOR4(int palIndex, int r, int g, int b) {
 	cmap[v8] = rv;
 	cmap[v8 + 1] = gv;
 	cmap[v8 + 2] = bv;
-	
+
 	WRITE_LE_UINT16(&SD_PIXELS[2 * palIndex], MapRGB(rv, gv, bv));
-	
+
 	if (Winbpp == 1)
 		g_system->getPaletteManager()->setPalette(cmap, palIndex, 1);
 }
@@ -1057,13 +1057,13 @@ void GraphicsManager::FADE_OUT_CASSE() {
 
 void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface) {
 	int rleValue;
-	int destOffset; 
-	const byte *srcP; 
+	int destOffset;
+	const byte *srcP;
 	byte srcByte;
 	byte destLen1;
-	byte *destSlice1P; 
-	byte destLen2; 
-	byte *destSlice2P; 
+	byte *destSlice1P;
+	byte destLen2;
+	byte *destSlice2P;
 
 	rleValue = 0;
 	destOffset = 0;
@@ -1133,7 +1133,7 @@ void GraphicsManager::Copy_Video_Vbe3(const byte *srcData) {
 		srcByte = *srcP;
 		if (*srcP < 222)
 			goto Video_Cont3_Vbe;
-    
+
 		if (srcByte == kByteStop)
 			return;
 		if (srcByte < kSetOffset) {
@@ -1243,9 +1243,9 @@ void GraphicsManager::Copy_Video_Vbe16(const byte *srcData) {
 }
 
 void GraphicsManager::Copy_Video_Vbe16a(const byte *srcData) {
-	int destOffset; 
-	const byte *srcP; 
-	byte pixelIndex; 
+	int destOffset;
+	const byte *srcP;
+	byte pixelIndex;
 
 	destOffset = 0;
 	srcP = srcData;
@@ -1278,9 +1278,9 @@ Video_Cont_Vbe16a:
 void GraphicsManager::Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height) {
 	const byte *srcP;
 	byte *destP;
-	int rowCount; 
+	int rowCount;
 	int i;
-	int rowCount2; 
+	int rowCount2;
 
 	// TODO: This code in the original is potentially dangerous, as it doesn't clip the area to within
 	// the screen, and so thus can read areas outside of the allocated surface buffer
@@ -1323,7 +1323,7 @@ void GraphicsManager::Sprite_Vesa(byte *surface, const byte *spriteData, int xp,
 	int width = READ_LE_UINT16(spriteP);
 	spriteP += 2;
 	int height = READ_LE_UINT16(spriteP);
-	
+
 	// Clip X
 	clip_x1 = width;
 	if ((xp + width) <= (min_x + 300))
@@ -1377,7 +1377,7 @@ void GraphicsManager::Sprite_Vesa(byte *surface, const byte *spriteData, int xp,
 
 	// Set up surface destination
 	byte *destP = surface + (yp - 300) * nbrligne2 + (xp - 300);
-	
+
 	// Handling for clipped versus non-clipped
 	if (clip_flag) {
 		// Clipped version
@@ -1424,7 +1424,7 @@ void GraphicsManager::Sprite_Vesa(byte *surface, const byte *spriteData, int xp,
 					Common::copy(spriteP, spriteP + width, tempDestP);
 					spriteP += width;
 				}
-				
+
 				tempDestP += width;
 			}
 
@@ -1468,7 +1468,7 @@ void GraphicsManager::RESET_SEGMENT_VESA() {
 	if (_vm->_globals.NBBLOC > 0) {
 		for (int idx = 0; idx != _vm->_globals.NBBLOC; idx++)
 			_vm->_globals.BLOC[idx].field0 = 0;
-    
+
 		_vm->_globals.NBBLOC = 0;
 	}
 }
@@ -1497,7 +1497,7 @@ void GraphicsManager::Ajoute_Segment_Vesa(int x1, int y1, int x2, int y2) {
 		do {
 			BlocItem &bloc = _vm->_globals.BLOC[blocIndex];
 
-			if (bloc.field0 == 1 
+			if (bloc.field0 == 1
 					&& tempX >= bloc.x1 && x2 <= bloc.x2
 					&& y1 >= bloc.y1 && y2 <= bloc.y2)
 				addFlag = false;
@@ -1505,7 +1505,7 @@ void GraphicsManager::Ajoute_Segment_Vesa(int x1, int y1, int x2, int y2) {
 			blocCount = blocIndex;
 		} while (_vm->_globals.NBBLOC + 1 != blocIndex);
 	}
-	
+
 	if (addFlag) {
 		assert(_vm->_globals.NBBLOC < 250);
 		BlocItem &bloc = _vm->_globals.BLOC[++_vm->_globals.NBBLOC];
@@ -1527,7 +1527,7 @@ int GraphicsManager::Magic_Number(signed int v) {
 		++result;
 	if (result & 2)
 		result += 2;
-  
+
 	return result;
 }
 
@@ -1544,14 +1544,14 @@ void GraphicsManager::Affiche_Segment_Vesa() {
 		Common::Rect &dstRect = dstrect[idx - 1];
 		if (bloc.field0 != 1)
 			continue;
-	
+
 		if (_vm->_eventsManager._breakoutFl) {
 			if (Winbpp == 1) {
 				Copy_Vga(VESA_BUFFER, bloc.x1, bloc.y1, bloc.x2 - bloc.x1, bloc.y2 - bloc.y1, bloc.x1, bloc.y1);
 			} else if (Winbpp == 2) {
 				Copy_Vga16(VESA_BUFFER, bloc.x1, bloc.y1, bloc.x2 - bloc.x1, bloc.y2 - bloc.y1, bloc.x1, bloc.y1);
 			}
-			
+
 			dstRect.left = bloc.x1 * 2;
 			dstRect.top = bloc.y1 * 2 + 30;
 			dstRect.setWidth((bloc.x2 - bloc.x1) * 2);
@@ -1561,7 +1561,7 @@ void GraphicsManager::Affiche_Segment_Vesa() {
 				bloc.x1 = _vm->_eventsManager._startPos.x;
 			if (bloc.x2 > (_vm->_eventsManager._startPos.x + SCREEN_WIDTH))
 				bloc.x2 = _vm->_eventsManager._startPos.x + SCREEN_WIDTH;
-			
+
 			if (SDL_ECHELLE) {
 				// Calculate the bounds
 				int xp = Magic_Number(bloc.x1) - 4;
@@ -1586,10 +1586,10 @@ void GraphicsManager::Affiche_Segment_Vesa() {
 				DD_Lock();
 
 				if (Winbpp == 2) {
-					m_scroll16A(VESA_BUFFER, xp, yp, width, height, 
+					m_scroll16A(VESA_BUFFER, xp, yp, width, height,
 						Reel_Zoom(xp - _vm->_eventsManager._startPos.x, SDL_ECHELLE), Reel_Zoom(yp, SDL_ECHELLE));
 				} else {
-					m_scroll2A(VESA_BUFFER, xp, yp, width, height, 
+					m_scroll2A(VESA_BUFFER, xp, yp, width, height,
 						Reel_Zoom(xp - _vm->_eventsManager._startPos.x, SDL_ECHELLE), Reel_Zoom(yp, SDL_ECHELLE));
 				}
 
@@ -1619,7 +1619,7 @@ void GraphicsManager::Affiche_Segment_Vesa() {
 				DD_Unlock();
 			}
 		}
-		
+
 		_vm->_globals.BLOC[idx].field0 = 0;
 	}
 
@@ -1650,13 +1650,13 @@ void GraphicsManager::AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, i
 void GraphicsManager::CopyAsm(const byte *surface) {
 	const byte *srcP;
 	byte srcByte;
-	byte *destP; 
+	byte *destP;
 	int yCtr;
 	int xCtr;
-	byte *dest1P; 
-	byte *dest2P; 
-	byte *dest3P; 
-	byte *destPitch; 
+	byte *dest1P;
+	byte *dest2P;
+	byte *dest3P;
+	byte *destPitch;
 	const byte *srcPitch;
 
 	assert(VideoPtr);
@@ -1668,7 +1668,7 @@ void GraphicsManager::CopyAsm(const byte *surface) {
 		srcPitch = srcP;
 		destPitch = destP;
 		xCtr = 320;
-    
+
 		do {
 			srcByte = *srcP;
 			*destP = *srcP;
@@ -1682,7 +1682,7 @@ void GraphicsManager::CopyAsm(const byte *surface) {
 			++srcP;
 			--xCtr;
 		} while (xCtr);
-		
+
 		srcP = srcPitch + 320;
 		destP = WinScan + WinScan + destPitch;
 		--yCtr;
@@ -1690,17 +1690,17 @@ void GraphicsManager::CopyAsm(const byte *surface) {
 }
 
 void GraphicsManager::CopyAsm16(const byte *surface) {
-	const byte *v1; 
-	byte *v2; 
-	int v3; 
-	signed int v4; 
-	byte *v5; 
-	uint16 *v6; 
-	int v; 
-	uint16 *v8; 
-	int v9; 
-	byte *v10; 
-	const byte *v11; 
+	const byte *v1;
+	byte *v2;
+	int v3;
+	signed int v4;
+	byte *v5;
+	uint16 *v6;
+	int v;
+	uint16 *v8;
+	int v9;
+	byte *v10;
+	const byte *v11;
 
 	assert(VideoPtr);
 	v1 = surface;
@@ -1770,7 +1770,7 @@ int GraphicsManager::Reel_Zoom(int v, int percentage) {
 int GraphicsManager::Asm_Zoom(int v, int percentage) {
 	if (v)
 		v += percentage * (long int)v / 100;
-  
+
 	return v;
 }
 
@@ -1781,22 +1781,22 @@ int GraphicsManager::Reel_Reduc(int v, int percentage) {
 int GraphicsManager::Asm_Reduc(int v, int percentage) {
 	if (v)
 		v -= percentage * (long int)v / 100;
-  
+
 	return v;
 }
- 
-// Display 'Perfect?' 
+
+// Display 'Perfect?'
 void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, int modeFlag) {
-	const byte *spriteStartP; 
-	int i; 
+	const byte *spriteStartP;
+	int i;
 	const byte *spriteSizeP;
-	const byte *spritePixelsP; 
-	byte *dest1P; 
-	byte *dest2P; 
-	byte *v29; 
-	byte *v40; 
-	const byte *v45; 
-	const byte *v46; 
+	const byte *spritePixelsP;
+	byte *dest1P;
+	byte *dest2P;
+	byte *v29;
+	byte *v40;
+	const byte *v45;
+	const byte *v46;
 
 	spriteStartP = srcData + 3;
 	for (i = frameIndex; i; --i)
@@ -2173,18 +2173,18 @@ void GraphicsManager::AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int
 }
 
 void GraphicsManager::SCOPY(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY) {
-	int top; 
-	int croppedWidth; 
+	int top;
+	int croppedWidth;
 	int croppedHeight;
-	int xRight; 
-	int top2; 
+	int xRight;
+	int top2;
 	int left;
 
 	left = x1;
 	top = y1;
 	croppedWidth = width;
 	croppedHeight = height;
-  
+
 	if (x1 < min_x) {
 		croppedWidth = width - (min_x - x1);
 		left = min_x;
@@ -2208,13 +2208,13 @@ void GraphicsManager::SCOPY(const byte *surface, int x1, int y1, int width, int
 }
 
 void GraphicsManager::Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned int width, int height, byte *destSurface, int destX, int destY) {
-	const byte *srcP; 
-	byte *destP; 
+	const byte *srcP;
+	byte *destP;
 	int yp;
 	int yCurrent;
 	byte *dest2P;
 	const byte *src2P;
-	unsigned int pitch; 
+	unsigned int pitch;
 
 	srcP = x1 + nbrligne2 * y1 + srcSurface;
 	destP = destX + nbrligne2 * destY + destSurface;
@@ -2233,16 +2233,16 @@ void GraphicsManager::Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned
 }
 
 // Display Font
-void GraphicsManager::Affiche_Fonte(byte *surface, const byte *spriteData, int xp, int yp, 
+void GraphicsManager::Affiche_Fonte(byte *surface, const byte *spriteData, int xp, int yp,
 									int characterIndex, int colour) {
 	const byte *spriteDataP;
-	int i; 
-	const byte *spriteSizeP; 
-	int spriteWidth; 
+	int i;
+	const byte *spriteSizeP;
+	int spriteWidth;
 	int spriteHeight;
 	const byte *spritePixelsP;
 	byte *destP;
-	int xCtr; 
+	int xCtr;
 	byte destByte;
 	byte *destLineP;
 	int yCtr;
@@ -2272,7 +2272,7 @@ void GraphicsManager::Affiche_Fonte(byte *surface, const byte *spriteData, int x
 					destByte = colour;
 				*destP = destByte;
 			}
-	      
+
 			++destP;
 			++spritePixelsP;
 			--xCtr;
@@ -2342,7 +2342,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
 	_vm->_globals.freeMemory(ptr);
 	if (mode != 1) {
 		_vm->_globals.COUCOU = _vm->_globals.freeMemory(_vm->_globals.COUCOU);
-		
+
 		filename = file + ".rep";
 		byte *dataP = _vm->_fileManager.searchCat(filename, 2);
 		_vm->_globals.COUCOU = dataP;
@@ -2357,7 +2357,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
 }
 
 void GraphicsManager::NB_SCREEN() {
-	byte *destP; 
+	byte *destP;
 	const byte *srcP;
 
 	if (!_vm->_globals.NECESSAIRE)
@@ -2380,7 +2380,7 @@ void GraphicsManager::NB_SCREEN() {
 			m_scroll2(VESA_BUFFER, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
 	}
 	DD_Unlock();
-	
+
 	destP = VESA_SCREEN;
 	srcP = VESA_BUFFER;
 	memcpy(VESA_SCREEN, VESA_BUFFER, 0x95FFCu);
@@ -2400,10 +2400,10 @@ void GraphicsManager::videkey() {
 }
 
 void GraphicsManager::Copy_WinScan_Vbe(const byte *src, byte *dest) {
-	int result; 
-	int destOffset; 
-	const byte *srcPtr; 
-	byte byteVal; 
+	int result;
+	int destOffset;
+	const byte *srcPtr;
+	byte byteVal;
 
 	result = 0;
 	destOffset = 0;
@@ -2435,10 +2435,10 @@ Video_Cont_wVbe:
 }
 
 void GraphicsManager::Copy_Video_Vbe(const byte *src) {
-	int destOffset; 
-	const byte *srcP; 
-	byte byteVal; 
-	
+	int destOffset;
+	const byte *srcP;
+	byte byteVal;
+
 	assert(VideoPtr);
 	destOffset = 0;
 	srcP = src;
@@ -2470,8 +2470,8 @@ Video_Cont_Vbe:
 
 // Reduce Screen
 void GraphicsManager::Reduc_Ecran(const byte *srcSurface, byte *destSurface, int xp, int yp, int width, int height, int zoom) {
-	const byte *srcP; 
-	byte *destP; 
+	const byte *srcP;
+	byte *destP;
 
 	srcP = xp + nbrligne2 * yp + srcSurface;
 	destP = destSurface;
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index df0c71f8c3..e92cbf8fdc 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -156,7 +156,7 @@ public:
 	void Copy_Video_Vbe16(const byte *srcData);
 	void Copy_Video_Vbe16a(const byte *srcData);
 	void Capture_Mem(const byte *srcSurface, byte *destSurface, int xs, int ys, int width, int height);
-	
+
 	/**
 	 * Draws a sprite onto the screen
 	 * @param surface		Destination surface
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 85a6e07aad..890aeffb1f 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -86,7 +86,7 @@ int LinesManager::ZONE_OBJET(int a1, int a2) {
 }
 
 int LinesManager::OPTI_ZONE(int a1, int a2, int a3) {
-	int v3; 
+	int v3;
 	signed int v4;
 
 	v3 = a2;
@@ -190,7 +190,7 @@ void LinesManager::AJOUTE_LIGNE_ZONE(int idx, int a2, int a3, int a4, int a5, in
 		}
 		*dataP++ = -1;
 		*dataP++ = -1;
-		
+
 		LigneZone[idx].count = v20;
 		LigneZone[idx].field2 = a6;
 	} else {
@@ -217,11 +217,11 @@ void LinesManager::RETIRE_LIGNE(int idx) {
 
 // Add Line
 void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6, int a7) {
-	int v7; 
-	int v8; 
-	int v9; 
-	byte *v10; 
-	int v11; 
+	int v7;
+	int v8;
+	int v9;
+	byte *v10;
+	int v11;
 	int v12;
 	int v13;
 	int v24;
@@ -257,7 +257,7 @@ void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6,
 	v33 = v9 + 1;
 	if (v8 > (int)(v9 + 1))
 		v34 = v8;
-	
+
 	v10 = _vm->_globals.allocMemory(4 * v34 + 8);
 	if (v10 == g_PTRNUL)
 		error("AJOUTE LIGNE OBSTACLE");
@@ -362,7 +362,7 @@ void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6,
 	v27 = v32 + 2;
 	v27[0] = -1;
 	v27[1] = -1;
-	
+
 	Ligne[idx].field0 = v35 + 1;
 	Ligne[idx].field2 = a7;
 	Ligne[idx].field4 = a2;
@@ -371,9 +371,9 @@ void LinesManager::AJOUTE_LIGNE(int idx, int a2, int a3, int a4, int a5, int a6,
 // Line Collision 2
 // TODO: Should return a bool
 int LinesManager::colision2_ligne(int a1, int a2, int *a3, int *a4, int a5, int a6) {
-	int16 *v7; 
-	int16 *v13; 
-	int result; 
+	int16 *v7;
+	int16 *v13;
+	int result;
 
 	int v24 = a5;
 	int v6 = a5;
@@ -430,7 +430,7 @@ LABEL_28:
 		}
 		for (;;) {
 			int v12 = v7[0];
-			
+
 			v13 = v7 + 1;
 			int v14 = v13[0];
 			v7 = v13 + 1;
@@ -451,7 +451,7 @@ LABEL_28:
 }
 
 int LinesManager::Scolision2_ligne(int a1, int a2, int *a3, int *a4, int a5, int a6) {
-	int16 *v7; 
+	int16 *v7;
 	int16 *v13;
 	int result;
 
@@ -550,16 +550,16 @@ LABEL_46:
 
 // Init route
 void LinesManager::INIPARCOURS() {
-	int v0; 
-	int v1; 
-	int v2; 
-	int16 *v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int16 *v7; 
-	int v8; 
-	int v9; 
+	int v0;
+	int v1;
+	int v2;
+	int16 *v3;
+	int v4;
+	int v5;
+	int v6;
+	int16 *v7;
+	int v8;
+	int v9;
 	int v11;
 	int v12;
 	int v13;
@@ -577,7 +577,7 @@ void LinesManager::INIPARCOURS() {
 
 		v4 = v3[2 * v2 - 2];
 		v5 = v3[2 * v2 - 1];
-		if (_vm->_graphicsManager.max_x == v4 || _vm->_graphicsManager.max_y == v5 || _vm->_graphicsManager.min_x == v4 
+		if (_vm->_graphicsManager.max_x == v4 || _vm->_graphicsManager.max_y == v5 || _vm->_graphicsManager.min_x == v4
 				|| _vm->_graphicsManager.min_y == v5)
 			v1 = 1;
 		if (v15 == v4 && v14 == v5)
@@ -622,7 +622,7 @@ int LinesManager::CONTOURNE(int a1, int a2, int a3, int a4, int a5, int16 *a6, i
 			int16 *v10 = Ligne[a1].lineData;
 			int v11 = v10[2 * i];
 			v50 = v10[2 * i + 1];
-			
+
 			int v12 = v8;
 			a6[v12] = v11;
 			a6[v12 + 1] = v50;
@@ -655,7 +655,7 @@ int LinesManager::CONTOURNE(int a1, int a2, int a3, int a4, int a5, int16 *a6, i
 			int16 *v18 = Ligne[v36].lineData;
 			int v19 = v18[2 * j];
 			v50 = v18[2 * j + 1];
-			
+
 			int v20 = v8;
 			a6[v20] = v19;
 			a6[v20 + 1] = v50;
@@ -746,7 +746,7 @@ int LinesManager::CONTOURNE1(int a1, int a2, int a3, int a4, int a5, int16 *a6,
 					a6[v19 + 1] = v50;
 					a6[v19 + 2] = Ligne[v15].field6;
 					v40 += a7;
-	
+
 				}
 			}
 			++v15;
@@ -825,52 +825,52 @@ int LinesManager::CONTOURNE1(int a1, int a2, int a3, int a4, int a5, int16 *a6,
 }
 
 int LinesManager::MIRACLE(int a1, int a2, int a3, int a4, int a5) {
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
-	int i; 
+	int i;
 	int v12;
 	int v13;
-	int j; 
+	int j;
 	int v15;
 	int v16;
-	int k; 
+	int k;
 	int v18;
 	int v19;
-	int l; 
+	int l;
 	int v21;
-	int v22; 
-	int v23; 
-	int v24; 
+	int v22;
+	int v23;
+	int v24;
 	int v25;
 	int v26;
-	int v27; 
+	int v27;
 	int v28;
 	int v29;
-	int v30; 
+	int v30;
 	int v31;
 	int v32;
-	int v33; 
-	int v35 = 0; 
-	int v36 = 0; 
-	int v37; 
-	int v38; 
-	int v39; 
-	int v40; 
-	int v41; 
-	int v42 = 0; 
-	int v43 = 0; 
-	int v44 = 0; 
-	int v45 = 0; 
-	int v46 = 0; 
-	int v47 = 0; 
-	int v48 = 0; 
-	int v49 = 0; 
-	int v50; 
-	int v51; 
+	int v33;
+	int v35 = 0;
+	int v36 = 0;
+	int v37;
+	int v38;
+	int v39;
+	int v40;
+	int v41;
+	int v42 = 0;
+	int v43 = 0;
+	int v44 = 0;
+	int v45 = 0;
+	int v46 = 0;
+	int v47 = 0;
+	int v48 = 0;
+	int v49 = 0;
+	int v50;
+	int v51;
 
 	v5 = a1;
 	v6 = a2;
@@ -1490,12 +1490,12 @@ LABEL_17:
 
 // Avoid 2
 int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
@@ -1516,7 +1516,7 @@ int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
 	int v28;
 	int v29;
 	int v31;
-	int v34; 
+	int v34;
 	int v35;
 	int v36;
 	int v37;
@@ -1557,32 +1557,32 @@ int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
 	int v72;
 	int j;
 	int16 *v74;
-	int v75; 
-	int v76; 
-	int v77; 
-	int v78; 
-	int v79; 
-	int v80; 
+	int v75;
+	int v76;
+	int v77;
+	int v78;
+	int v79;
+	int v80;
 	int16 *v81;
-	int v82; 
-	int v83; 
-	int16 *v84; 
-	int v85; 
-	int v86; 
-	int v87; 
-	int v88; 
-	int v89; 
+	int v82;
+	int v83;
+	int16 *v84;
+	int v85;
+	int v86;
+	int v87;
+	int v88;
+	int v89;
 	int v90;
-	int16 *v91; 
+	int16 *v91;
 	int v92;
-	int v93; 
+	int v93;
 	int v94;
-	int16 *v95; 
+	int16 *v95;
 	int v96;
-	int v97; 
-	int v98; 
-	int v99; 
-	int v100; 
+	int v97;
+	int v98;
+	int v99;
+	int v100;
 	int v101;
 	int v102;
 	int v103;
@@ -1591,23 +1591,23 @@ int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
 	int v106;
 	int v107;
 	int v108;
-	int v109; 
-	int v110; 
-	int v111; 
-	int v112; 
+	int v109;
+	int v110;
+	int v111;
+	int v112;
 	int v113;
-	int v114; 
-	int v115; 
-	int v116; 
-	int v117; 
-	int v118; 
-	int v119; 
-	int v120; 
-	int v121; 
-	int v122; 
-	int v123; 
-	int v124; 
-	int v125; 
+	int v114;
+	int v115;
+	int v116;
+	int v117;
+	int v118;
+	int v119;
+	int v120;
+	int v121;
+	int v122;
+	int v123;
+	int v124;
+	int v125;
 	int v126[9];
 	int v131[9];
 	int v136[9];
@@ -1683,7 +1683,7 @@ int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
 		if (v11 <= 3)
 			return (int16 *)g_PTRNUL;
 	}
-	
+
 	for (v12 = 0; v12 <= 8; ++v12) {
 		v141[v12] = -1;
 		v136[v12] = 0;
@@ -1817,13 +1817,13 @@ int16 *LinesManager::PARCOURS2(int srcX, int srcY, int destX, int destY) {
 			v121 = v141[7];
 			v120 = v136[7];
 		}
-		
+
 		for (v12 = 0; v12 <= 8; ++v12) {
 			v141[v12] = -1;
 			v136[v12] = 0;
 			v131[v12] = 1300;
 			v126[v12] = 1300;
-		} 
+		}
 
 		v34 = 0;
 		v35 = srcY;
@@ -2311,29 +2311,29 @@ int LinesManager::PARC_PERS(int a1, int a2, int a3, int a4, int a5, int a6, int
 	int v73;
 	int v74;
 	int v76;
-	int16 *v77; 
-	int16 *v78; 
-	int v79; 
-	int16 *v80; 
-	int v81; 
-	int16 *v82; 
-	int v83; 
-	int16 *v84; 
-	int v85; 
-	int16 *v86; 
-	int v87; 
-	int16 *v88; 
-	int v89; 
-	int v90; 
-	int v91; 
-	int v92; 
-	int v93; 
-	int v94; 
-	int v95; 
-	int v96; 
-	int v97; 
-	int v98; 
-	int v99; 
+	int16 *v77;
+	int16 *v78;
+	int v79;
+	int16 *v80;
+	int v81;
+	int16 *v82;
+	int v83;
+	int16 *v84;
+	int v85;
+	int16 *v86;
+	int v87;
+	int16 *v88;
+	int v89;
+	int v90;
+	int v91;
+	int v92;
+	int v93;
+	int v94;
+	int v95;
+	int v96;
+	int v97;
+	int v98;
+	int v99;
 	int v100;
 	int v101;
 	int v102;
@@ -2374,11 +2374,11 @@ int LinesManager::PARC_PERS(int a1, int a2, int a3, int a4, int a5, int a6, int
 	int v137;
 	int v138;
 	int v139;
-	int v140; 
-	int v141; 
-	int v142; 
-	int v143; 
-	int v144; 
+	int v140;
+	int v141;
+	int v142;
+	int v143;
+	int v144;
 	int v145;
 	int colResult = 0;
 
@@ -2661,7 +2661,7 @@ LABEL_157:
 	v32[v31] = -1;
 	v32[v31 + 1] = -1;
 	v32[v31 + 2] = -1;
-	
+
 	v117 = 0;
 	v33 = v98;
 	v92 = v97;
@@ -3085,20 +3085,20 @@ LABEL_248:
 }
 
 int LinesManager::VERIF_SMOOTH(int a1, int a2, int a3, int a4) {
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
-	int v11; 
-	int v12; 
-	int v13; 
-	int v14; 
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
+	int v11;
+	int v12;
+	int v13;
+	int v14;
 	int v15;
 	int v16;
-	int v17; 
-	int v18; 
+	int v17;
+	int v18;
 
 	v4 = a1 - a3;
 	if (a1 - a3 < 0)
@@ -3140,27 +3140,27 @@ int LinesManager::VERIF_SMOOTH(int a1, int a2, int a3, int a4) {
 }
 
 int LinesManager::SMOOTH_MOVE(int a3, int a4, int a5, int a6) {
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
-	int v13; 
-	int v14; 
-	int v15; 
+	int v13;
+	int v14;
+	int v15;
 	int v16;
 	int v17;
 	int v18;
 	int v19;
 	int v20;
 	int v21;
-	int v22; 
-	int v23; 
-	int v24; 
-	int v25; 
-	int v26; 
+	int v22;
+	int v23;
+	int v24;
+	int v25;
+	int v26;
 	int v27;
 	int v28;
 	int v29;
@@ -3169,33 +3169,33 @@ int LinesManager::SMOOTH_MOVE(int a3, int a4, int a5, int a6) {
 	int v32;
 	int v33;
 	int v34;
-	int v35; 
-	int v37; 
-	int v38; 
-	int v39; 
-	int v40; 
-	int v41; 
-	int v42; 
-	int v43; 
-	int v44; 
-	int v45; 
-	int v46; 
-	int v47; 
-	int v48; 
-	int v49 = 0; 
-	int v50; 
-	int v51; 
-	int v52; 
-	int v53; 
-	int v54; 
-	int v55; 
-	int v56; 
-	int v57; 
-	int v58; 
-	int v59; 
-	int v60; 
-	int v61; 
-	int v62; 
+	int v35;
+	int v37;
+	int v38;
+	int v39;
+	int v40;
+	int v41;
+	int v42;
+	int v43;
+	int v44;
+	int v45;
+	int v46;
+	int v47;
+	int v48;
+	int v49 = 0;
+	int v50;
+	int v51;
+	int v52;
+	int v53;
+	int v54;
+	int v55;
+	int v56;
+	int v57;
+	int v58;
+	int v59;
+	int v60;
+	int v61;
+	int v62;
 	int v63;
 
 	v62 = a3;
@@ -3408,53 +3408,53 @@ LABEL_85:
 }
 
 int LinesManager::PLAN_TEST(int a1, int a2, int a3, int a4, int a5, int a6) {
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
-	int v10; 
-	int v11; 
-	int v12; 
-	int v13; 
-	int v14; 
-	int16 *v15; 
-	int v16; 
-	int v17; 
-	int v18; 
-	int v19; 
-	int16 *v20; 
-	int v21; 
-	int v22; 
-	int v23; 
-	int16 *v25; 
-	int16 *v26; 
-	int v27; 
-	int v28; 
-	int v29; 
-	int v30; 
-	int v31; 
-	int v32; 
-	int v33 = 0; 
-	int v34 = 0; 
-	int v35; 
-	int v36; 
-	int v37; 
-	int v38; 
-	int v39; 
-	int v40; 
-	int v41; 
-	int v42; 
-	int v43; 
-	int v44; 
-	int v45; 
-	int v46; 
-	int v47; 
-	int v48; 
-	int v49; 
-	int v50; 
-	int v51; 
-	int v52; 
-	int v53; 
+	int v6;
+	int v7;
+	int v8;
+	int v9;
+	int v10;
+	int v11;
+	int v12;
+	int v13;
+	int v14;
+	int16 *v15;
+	int v16;
+	int v17;
+	int v18;
+	int v19;
+	int16 *v20;
+	int v21;
+	int v22;
+	int v23;
+	int16 *v25;
+	int16 *v26;
+	int v27;
+	int v28;
+	int v29;
+	int v30;
+	int v31;
+	int v32;
+	int v33 = 0;
+	int v34 = 0;
+	int v35;
+	int v36;
+	int v37;
+	int v38;
+	int v39;
+	int v40;
+	int v41;
+	int v42;
+	int v43;
+	int v44;
+	int v45;
+	int v46;
+	int v47;
+	int v48;
+	int v49;
+	int v50;
+	int v51;
+	int v52;
+	int v53;
 
 	v41 = a3;
 	v40 = TEST_LIGNE(a1, a2 - 2, &v42, &v50, &v46);
@@ -3620,30 +3620,30 @@ LABEL_60:
 
 // Test line
 int LinesManager::TEST_LIGNE(int a1, int a2, int *a3, int *a4, int *a5) {
-	int i; 
-	int v6; 
-	int16 *v7; 
-	int v8; 
-	int v9; 
-	int v10; 
-	int v11; 
-	int16 *v12; 
-	int v13; 
-	int v14; 
-	int v15; 
-	int v16; 
-	int16 *v17; 
-	int v18; 
-	int v19; 
-	int v20; 
-	int v21; 
-	int result; 
-	int v23; 
-	int v24 = 0; 
-	int v25; 
-	int v26; 
-	int v27; 
-	int v28; 
+	int i;
+	int v6;
+	int16 *v7;
+	int v8;
+	int v9;
+	int v10;
+	int v11;
+	int16 *v12;
+	int v13;
+	int v14;
+	int v15;
+	int v16;
+	int16 *v17;
+	int v18;
+	int v19;
+	int v20;
+	int v21;
+	int result;
+	int v23;
+	int v24 = 0;
+	int v25;
+	int v26;
+	int v27;
+	int v28;
 
 	v26 = 0;
 	v25 = _vm->_objectsManager.DERLIGNE + 1;
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index 7dbd386d90..e63cde6b34 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -42,7 +42,7 @@ void MenuManager::setParent(HopkinsEngine *vm) {
 enum MenuSelection { MENU_NONE = 0, PLAY_GAME = 1, LOAD_GAME = 2, OPTIONS = 3, INTRODUCTION = 4, QUIT = 5 };
 
 int MenuManager::MENU() {
-	byte *spriteData = NULL; 
+	byte *spriteData = NULL;
 	MenuSelection menuIndex;
 	Common::Point mousePos;
 	signed int result;
@@ -65,7 +65,7 @@ int MenuManager::MENU() {
 
 		for (int idx = 0; idx < 31; ++idx)
 			_vm->_globals.INVENTAIRE[idx] = 0;
-    
+
 		memset(_vm->_globals.SAUVEGARDE, 0, 2000);
 		_vm->_objectsManager.AJOUTE_OBJET(14);
 		frame5Index = 0;
@@ -81,7 +81,7 @@ int MenuManager::MENU() {
 			_vm->_graphicsManager.LOAD_IMAGE("MENUFR");
 		else if (_vm->_globals.FR == 2)
 			_vm->_graphicsManager.LOAD_IMAGE("MENUES");
-    
+
 		_vm->_graphicsManager.FADE_INW();
 		if (_vm->_globals.FR == 0)
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENUAN.SPR");
@@ -89,13 +89,13 @@ int MenuManager::MENU() {
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENUFR.SPR");
 		else if (_vm->_globals.FR == 2)
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENUES.SPR");
-    
+
 		spriteData = _vm->_objectsManager.CHARGE_SPRITE(_vm->_globals.NFICHIER);
 		_vm->_eventsManager.mouseOn();
 		_vm->_eventsManager.changeMouseCursor(0);
 		_vm->_eventsManager._mouseCursorId = 0;
 		_vm->_eventsManager._mouseSpriteId = 0;
-    
+
 		for (;;) {
 			for (;;) {
 				_vm->_soundManager.WSOUND(28);
@@ -108,7 +108,7 @@ int MenuManager::MENU() {
 
 					menuIndex = MENU_NONE;
 					mousePos = Common::Point(_vm->_eventsManager.getMouseX(), _vm->_eventsManager.getMouseY());
-          
+
 					if ((uint16)(mousePos.x - 232) <= 176) {
 						if ((uint16)(mousePos.y - 261) <= 23)
 							menuIndex = PLAY_GAME;
@@ -118,11 +118,11 @@ int MenuManager::MENU() {
 							menuIndex = OPTIONS;
 						if ((uint16)(mousePos.y - 356) <= 23)
 							menuIndex = INTRODUCTION;
-            
+
 						if ((uint16)(mousePos.y - 388) <= 23)
 							menuIndex = QUIT;
 					}
-          
+
 					switch (menuIndex) {
 					case MENU_NONE:
 						frame1Index = 0;
@@ -166,18 +166,18 @@ int MenuManager::MENU() {
 						frame4Index = 0;
 						frame5Index = 1;
 					}
-          
+
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, frame1Index);
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, frame2Index + 2);
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, frame3Index + 4);
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 354, frame4Index + 6);
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 386, frame5Index + 8);
 					_vm->_eventsManager.VBL();
-          
+
 					if (_vm->_eventsManager.getMouseButton() == 1 && menuIndex != MENU_NONE)
 						selectionMade = 1;
 				} while (!selectionMade);
-        
+
 				if (menuIndex == PLAY_GAME) {
 					_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 259, 10);
 					_vm->_eventsManager.VBL();
@@ -190,20 +190,20 @@ int MenuManager::MENU() {
 				_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 291, 11);
 				_vm->_eventsManager.VBL();
 				_vm->_eventsManager.delay(200);
-        
+
 				_vm->_globals.SORTIE = -1;
 				_vm->_dialogsManager.showLoadGame();
-        
+
 				if (_vm->_globals.SORTIE != -1) {
 					result = _vm->_globals.SORTIE;
 					break;
 				}
 				_vm->_globals.SORTIE = 0;
 			}
-      
+
 			if (menuIndex != OPTIONS)
 				break;
-      
+
 			// Options menu item selected
 			_vm->_graphicsManager.AFFICHE_SPEED(spriteData, 230, 322, 12);
 			_vm->_eventsManager.VBL();
@@ -228,7 +228,7 @@ int MenuManager::MENU() {
 		}
 		break;
 	}
-  
+
 	_vm->_globals.freeMemory(spriteData);
 	_vm->_globals._disableInventFl = false;
 	_vm->_globals.FLAG_VISIBLE = false;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 3bc788eb3c..dc09154d82 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -87,7 +87,7 @@ ObjectsManager::ObjectsManager() {
 	OBSSEUL = 0;
 	NVVERBE = 0;
 	NVZONE = 0;
-	S_old_ani = 0; 
+	S_old_ani = 0;
 	S_old_ret = 0;
 	nouveau_x = nouveau_y = 0;
 	nouveau_sens = 0;
@@ -136,7 +136,7 @@ byte *ObjectsManager::CAPTURE_OBJET(int objIndex, int mode) {
 		dataP = _vm->_globals.allocMemory(height * width);
 		if (dataP == g_PTRNUL)
 			error("CAPTURE_OBJET");
-			
+
 		capture_mem_sprite(_vm->_globals.ADR_FICHIER_OBJ, dataP, val2);
 		break;
 
@@ -184,7 +184,7 @@ void ObjectsManager::set_offsetxy(byte *data, int idx, int xp, int yp, bool isSi
 	byte *startP = data + 3;
 	for (int i = idx; i; --i)
 		startP += READ_LE_UINT32(startP) + 16;
-	
+
 	byte *rectP = startP + 8;
 	if (isSize == 1) {
 		// Set size
@@ -202,7 +202,7 @@ int ObjectsManager::get_offsetx(const byte *spriteData, int spriteIndex, bool is
 	const byte *v3 = spriteData + 3;
 	for (int i = spriteIndex; i; --i)
 		v3 += READ_LE_UINT32(v3) + 16;
-  
+
 	const byte *v5 = v3 + 8;
 	int result = (int16)READ_LE_UINT16(v5);
 	if (isSize)
@@ -215,7 +215,7 @@ int ObjectsManager::get_offsety(const byte *spriteData, int spriteIndex, bool is
 	const byte *v3 = spriteData + 3;
 	for (int i = spriteIndex; i; --i)
 		v3 += READ_LE_UINT32(v3) + 16;
-  
+
 	const byte *v5 = v3 + 10;
 	int result = (int16)READ_LE_UINT16(v5);
 	if (isSize)
@@ -231,7 +231,7 @@ int ObjectsManager::getWidth(const byte *objectData, int idx) {
 	const byte *rectP = objectData + 3;
 	for (int i = idx; i; --i)
 		rectP += READ_LE_UINT32(rectP) + 16;
-	
+
 	return (int16)READ_LE_UINT16(rectP + 4);
 }
 
@@ -242,7 +242,7 @@ int ObjectsManager::getHeight(const byte *objectData, int idx) {
 	const byte *rectP = objectData + 3;
 	for (int i = idx; i; --i)
 		rectP += READ_LE_UINT32(rectP) + 16;
-	
+
 	return (int16)READ_LE_UINT16(rectP + 6);
 }
 
@@ -262,7 +262,7 @@ int ObjectsManager::sprite_alone(const byte *objectData, byte *sprite, int objIn
 byte *ObjectsManager::DEL_FICHIER_OBJ() {
 	_vm->_globals.NUM_FICHIER_OBJ = 0;
 	_vm->_globals.ADR_FICHIER_OBJ = _vm->_globals.freeMemory(_vm->_globals.ADR_FICHIER_OBJ);
-  
+
 	return g_PTRNUL;
 }
 
@@ -295,7 +295,7 @@ int ObjectsManager::AJOUTE_OBJET(int objIndex) {
 		if (arrIndex == 32)
 			flag = true;
 	} while (!flag);
-  
+
 	_vm->_globals.INVENTAIRE[arrIndex] = objIndex;
 	return arrIndex;
 }
@@ -312,7 +312,7 @@ void ObjectsManager::AFF_SPRITES() {
 	int v9;
 	int v11;
 	uint16 *v12;
-	int v13; 
+	int v13;
 	int y1_1;
 	int y1_2;
 	int v25;
@@ -331,12 +331,12 @@ void ObjectsManager::AFF_SPRITES() {
 		if (_vm->_fontManager._textList[idx]._enabledFl && _vm->_fontManager._text[idx]._textType != 2) {
 			v1 = _vm->_fontManager._textList[idx]._pos.x;
 			x1_1 = v1 - 2;
-      
+
 			if ((int16)(v1 - 2) < _vm->_graphicsManager.min_x)
 				x1_1 = _vm->_graphicsManager.min_x;
 			v2 = _vm->_fontManager._textList[idx]._pos.y;
 			y1_1 = v2 - 2;
-      
+
 			if ((int16)(v2 - 2) < _vm->_graphicsManager.min_y)
 				y1_1 = _vm->_graphicsManager.min_y;
 			destX = v1 - 2;
@@ -345,7 +345,7 @@ void ObjectsManager::AFF_SPRITES() {
 			destY = v2 - 2;
 			if (destY < _vm->_graphicsManager.min_y)
 				destY = _vm->_graphicsManager.min_y;
-			
+
 			_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, x1_1, y1_1,
 				_vm->_fontManager._textList[idx]._width + 4, _vm->_fontManager._textList[idx]._height + 4,
 				_vm->_graphicsManager.VESA_BUFFER,
@@ -371,15 +371,15 @@ void ObjectsManager::AFF_SPRITES() {
 				v9 = v7 - 2;
 				if (v9 < _vm->_graphicsManager.min_y)
 					v9 = _vm->_graphicsManager.min_y;
-	        
-				_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, x1_2, y1_2, 
-					_vm->_globals.Liste[idx].width + 4, _vm->_globals.Liste[idx].height + 4, 
+
+				_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, x1_2, y1_2,
+					_vm->_globals.Liste[idx].width + 4, _vm->_globals.Liste[idx].height + 4,
 					_vm->_graphicsManager.VESA_BUFFER, v8, v9);
 				_vm->_globals.Liste[idx].field0 = 0;
 			}
-		} 
+		}
 	}
-  
+
 	AFF_BOB_ANIM();
 	AFF_VBOB();
 
@@ -392,19 +392,19 @@ void ObjectsManager::AFF_SPRITES() {
 				if (Sprite[idx].field2A == 1)
 					AvantTri(TRI_SPRITE, idx, Sprite[idx].field32 + Sprite[idx].field2E);
 			}
-		} 
-    
+		}
+
 		if (_vm->_globals.CACHEFLAG)
 			VERIFCACHE();
 	}
-  
+
 	if (PRIORITY == 1 && _vm->_globals.NBTRI) {
 		v33 = 1;
 		do {
 			arr[v33] = v33;
 			++v33;
 		} while (v33 <= 48);
-    
+
 		v25 = _vm->_globals.NBTRI;
 		do {
 			v27 = 0;
@@ -424,7 +424,7 @@ void ObjectsManager::AFF_SPRITES() {
 				} while (v34 < v26);
 			}
 		} while (v27);
-    
+
 		v35 = 1;
 		if (_vm->_globals.NBTRI + 1 > 1) {
 			do {
@@ -474,7 +474,7 @@ void ObjectsManager::AFF_SPRITES() {
 		_vm->_globals.Tri[idx].priority = 0;
 		_vm->_globals.Tri[idx].unused = 0;
 	}
-  
+
 	_vm->_globals.NBTRI = 0;
 	if (_vm->_dialogsManager._inventDisplayedFl) {
 		_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager._inventWin1, _vm->_dialogsManager._inventX, _vm->_dialogsManager._inventY, _vm->_dialogsManager._inventWidth, _vm->_dialogsManager._inventHeight);
@@ -484,32 +484,32 @@ void ObjectsManager::AFF_SPRITES() {
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_dialogsManager._inventBuf2, cadx + 300, cady + 300, cadi);
 		_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_dialogsManager._inventX, _vm->_dialogsManager._inventY, _vm->_dialogsManager._inventX + _vm->_dialogsManager._inventWidth, _vm->_dialogsManager._inventY + _vm->_dialogsManager._inventHeight);
 	}
-  
+
 	if (SL_FLAG == true) {
 		_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER, SL_SPR, _vm->_eventsManager._startPos.x + 183, 60, 0x112u, 353);
 		if (SL_X && SL_Y)
 			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, SL_SPR2, SL_X + _vm->_eventsManager._startPos.x + 300, SL_Y + 300, 0);
-    
+
 		_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_eventsManager._startPos.x + 183, 60, _vm->_eventsManager._startPos.x + 457, 413);
 	}
 
 	// If the Options dialog is activated, draw the elements
 	if (_vm->_globals._optionDialogFl) {
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 464, 407, 0);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 657, 556, _vm->_globals.opt_vitesse);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 731, 495, _vm->_globals.opt_txt);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 731, 468, _vm->_globals.opt_voice);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 731, 441, _vm->_globals.opt_sound);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 731, 414, _vm->_globals.opt_music);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 600, 522, _vm->_globals.opt_anm);
-		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR, 
+		_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.OPTION_SPR,
 			_vm->_eventsManager._startPos.x + 611, 502, _vm->_globals.opt_scrspeed);
 		_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_eventsManager._startPos.x + 164, 107, _vm->_eventsManager._startPos.x + 498, 320);
 	}
@@ -526,12 +526,12 @@ void ObjectsManager::AFF_SPRITES() {
 					_vm->_fontManager._text[idx]._messageId, _vm->_fontManager._text[idx]._filename,
 					_vm->_fontManager._text[idx]._pos.x, _vm->_fontManager._text[idx]._pos.y);
 			_vm->_fontManager._textList[idx]._enabledFl = true;
-			
+
 			if ((_vm->_fontManager._text[idx]._textType < 2) || (_vm->_fontManager._text[idx]._textType > 3))
 				_vm->_fontManager._textList[idx]._pos.x = _vm->_eventsManager._startPos.x + _vm->_fontManager._text[idx]._pos.x;
 			else
 				_vm->_fontManager._textList[idx]._pos.x = _vm->_fontManager._text[idx]._pos.x;
-      
+
 			_vm->_fontManager._textList[idx]._pos.y = _vm->_fontManager._text[idx]._pos.y;
 			_vm->_fontManager._textList[idx]._width = _vm->_fontManager._text[idx]._width;
 			_vm->_fontManager._textList[idx]._height = _vm->_fontManager._text[idx]._height;
@@ -551,7 +551,7 @@ void ObjectsManager::AFF_SPRITES() {
 				_vm->_fontManager._textList[idx]._enabledFl = false;
 		}
 	}
-  
+
 	_vm->_dialogsManager.inventAnim();
 }
 
@@ -604,10 +604,10 @@ void ObjectsManager::DEF_BOB(int idx) {
 		int yp = _vm->_globals.Bob[idx].oldY;
 
 		if (_vm->_globals.Bob[idx].isSprite)
-			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.Bob[idx].spriteData, 
+			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.Bob[idx].spriteData,
 				xp + 300, yp + 300, _vm->_globals.Bob[idx].frameIndex);
 		else
-			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, 
+			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER,
 				_vm->_globals.Bob[idx].spriteData, xp + 300, yp + 300, _vm->_globals.Bob[idx].frameIndex,
 				_vm->_globals.Bob[idx].field4A, _vm->_globals.Bob[idx].oldY2,
 				_vm->_globals.Bob[idx].field38);
@@ -615,7 +615,7 @@ void ObjectsManager::DEF_BOB(int idx) {
 		_vm->_globals.Liste2[idx].field0 = 1;
 		_vm->_globals.Liste2[idx].xp = xp;
 		_vm->_globals.Liste2[idx].yp = yp;
-		
+
 		_vm->_globals.Liste2[idx].width = _vm->_globals.Bob[idx].oldWidth;
 		_vm->_globals.Liste2[idx].height = _vm->_globals.Bob[idx].oldHeight;
 
@@ -625,21 +625,21 @@ void ObjectsManager::DEF_BOB(int idx) {
 			_vm->_globals.Liste2[idx].width -= _vm->_graphicsManager.min_x - v5;
 			_vm->_globals.Liste2[idx].xp = v6;
 		}
-    
+
 		int v7 = _vm->_globals.Liste2[idx].yp;
 		int v8 = _vm->_graphicsManager.min_y;
 		if (v7 < _vm->_graphicsManager.min_y) {
 			_vm->_globals.Liste2[idx].height -= _vm->_graphicsManager.min_y - v7;
 			_vm->_globals.Liste2[idx].yp = v8;
 		}
-    
+
 		int v9 = _vm->_globals.Liste2[idx].xp;
 		if (_vm->_globals.Liste2[idx].width + v9 > _vm->_graphicsManager.max_x)
 			_vm->_globals.Liste2[idx].width = _vm->_graphicsManager.max_x - v9;
 		int v10 = _vm->_globals.Liste2[idx].yp;
 		if (_vm->_globals.Liste2[idx].height + v10 > _vm->_graphicsManager.max_y)
 			_vm->_globals.Liste2[idx].height = _vm->_graphicsManager.max_y - v10;
-    
+
 		if (_vm->_globals.Liste2[idx].width <= 0 || _vm->_globals.Liste2[idx].height <= 0)
 		_vm->_globals.Liste2[idx].field0 = 0;
 
@@ -670,10 +670,10 @@ void ObjectsManager::BOB_VISU(int idx) {
 					v9 = 1;
 				if (!v6)
 					v6 = -1;
-			
+
 				if ((int16)READ_LE_UINT16(data + 24)) {
 					_vm->_globals.Bob[idx].isSprite = false;
-          
+
 					if (_vm->_globals.Bank[v1].fileHeader == 1) {
 						_vm->_globals.Bob[idx].isSprite = true;
 						_vm->_globals.Bob[idx].field36 = 0;
@@ -726,7 +726,7 @@ void ObjectsManager::SCBOB(int idx) {
 			int v4 =_vm->_globals.Cache[idx].field4;
 			int v7 =_vm->_globals.Cache[idx].field6 + v3;
 			int v1 =_vm->_globals.Cache[idx].field14 +_vm->_globals.Cache[idx].field8 + v4;
-          
+
 			if ((v6 > v4) && (v6 < v1)) {
 				v1 = 0;
 				if (v9 >= v3 && v9 <= (_vm->_globals.Cache[idx].field6 + v3)) {
@@ -764,7 +764,7 @@ void ObjectsManager::CALCUL_BOB(int idx) {
 		_vm->_globals.Bob[idx].field38 = 0;
 		_vm->_globals.Bob[idx].field36 = 0;
 	}
-  
+
 	int result = _vm->_globals.Bob[idx].frameIndex;
 	if (result != 250) {
 		int v5, v15, v22;
@@ -775,13 +775,13 @@ void ObjectsManager::CALCUL_BOB(int idx) {
 			v22 = v15 = get_offsetx(_vm->_globals.Bob[idx].spriteData, result, 0);
 			v5 = get_offsety(_vm->_globals.Bob[idx].spriteData, _vm->_globals.Bob[idx].frameIndex, 0);
 		}
-    
+
 		int v17 = v5;
 		int v6 = v5;
 		int v21 = 0;
 		int v20 = 0;
 		int v7 = _vm->_globals.Bob[idx].field36;
-		
+
 		if (v7 < 0) {
 			v7 = -v7;
 			v20 = v7;
@@ -808,7 +808,7 @@ void ObjectsManager::CALCUL_BOB(int idx) {
 				v17 = -_vm->_graphicsManager.Reel_Zoom(v9, v21);
 			}
 		}
-    
+
 		if (v20) {
 			if (v15 >= 0) {
 				v22 = _vm->_graphicsManager.Reel_Reduc(v15, v20);
@@ -825,7 +825,7 @@ void ObjectsManager::CALCUL_BOB(int idx) {
 				v17 = -_vm->_graphicsManager.Reel_Reduc(v11, v20);
 			}
 		}
-    
+
 		int v13 = _vm->_globals.Bob[idx].xp - v22;
 		int v14 = _vm->_globals.Bob[idx].yp - v17;
 		_vm->_globals.Bob[idx].isActive = true;
@@ -849,7 +849,7 @@ void ObjectsManager::CALCUL_BOB(int idx) {
 			height = _vm->_graphicsManager.Reel_Reduc(height, v20);
 			width = _vm->_graphicsManager.Reel_Reduc(width, v20);
 		}
-		
+
 		_vm->_globals.Liste2[idx].width = width;
 		_vm->_globals.Liste2[idx].height = height;
 		_vm->_globals.Bob[idx].oldWidth = width;
@@ -862,11 +862,11 @@ void ObjectsManager::VERIFCACHE() {
 	int v2;
 	int v3;
 	int v4;
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 
@@ -884,7 +884,7 @@ void ObjectsManager::VERIFCACHE() {
 						v6 = _vm->_globals.Cache[v8].field0;
 						v3 = _vm->_globals.Cache[v8].field4;
 						v9 = _vm->_globals.Cache[v8].field6 + v6;
-            
+
 						if (v2 > v3) {
 							if (v2 < (_vm->_globals.Cache[v8].field14 + _vm->_globals.Cache[v8].field8 + v3)) {
 								v4 = 0;
@@ -916,10 +916,10 @@ void ObjectsManager::VERIFCACHE() {
 						}
 					}
 				}
-			
+
 				++v10;
 			} while (v10 <= 4);
-      
+
 			SCBOB(v8);
 			if (_vm->_globals.Cache[v8].fieldA == v7) {
 				if (_vm->_globals.Cache[v8].field10 == 1) {
@@ -927,11 +927,11 @@ void ObjectsManager::VERIFCACHE() {
 					_vm->_globals.Cache[v8].fieldA = 1;
 				}
 			} else {
-				v5 = _vm->_globals.Cache[v8].field14 + _vm->_globals.Cache[v8].field8 + 
+				v5 = _vm->_globals.Cache[v8].field14 + _vm->_globals.Cache[v8].field8 +
 					_vm->_globals.Cache[v8].field4;
 				if (v5 > 440)
 					v5 = 500;
-				
+
 				AvantTri(TRI_CACHE, v8, v5);
 				_vm->_globals.Cache[v8].fieldA = 1;
 				_vm->_globals.Cache[v8].field10 = 1;
@@ -942,28 +942,28 @@ void ObjectsManager::VERIFCACHE() {
 }
 
 void ObjectsManager::DEF_SPRITE(int idx) {
-	int v2; 
+	int v2;
 	int v3;
 	int v4;
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
-	int v13; 
+	int v13;
 
 	v2 = idx;
 	if (Sprite[v2].field2A) {
 		v3 = Sprite[v2].field2C;
 		v4 = Sprite[v2].field2E;
 		if (Sprite[v2].field28)
-			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, Sprite[v2].spriteData, 
+			_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, Sprite[v2].spriteData,
 			v3 + 300, v4 + 300, Sprite[v2].spriteIndex);
 		else
-			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, Sprite[v2].spriteData, 
+			_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER, Sprite[v2].spriteData,
 				v3 + 300, v4 + 300,  Sprite[v2].spriteIndex, Sprite[v2].field36, Sprite[v2].field34, Sprite[v2].fieldE);
 
 		v5 = idx;
@@ -972,7 +972,7 @@ void ObjectsManager::DEF_SPRITE(int idx) {
 		_vm->_globals.Liste[v5].height = Sprite[v6].field32;
 		v7 = _vm->_globals.Liste[v5].field2;
 		v8 = _vm->_graphicsManager.min_x;
-		
+
 		if (v7 < _vm->_graphicsManager.min_x) {
 			_vm->_globals.Liste[v5].width -= _vm->_graphicsManager.min_x - v7;
 			_vm->_globals.Liste[v5].field2 = v8;
@@ -1007,9 +1007,9 @@ void ObjectsManager::DEF_CACHE(int idx) {
 	_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.CACHE_BANQUE[1],
 		_vm->_globals.Cache[idx].field0 + 300, _vm->_globals.Cache[idx].field4 + 300,
 		_vm->_globals.Cache[idx].field2);
-  
-	_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_globals.Cache[idx].field0, 
-			_vm->_globals.Cache[idx].field4, 
+
+	_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_globals.Cache[idx].field0,
+			_vm->_globals.Cache[idx].field4,
 			_vm->_globals.Cache[idx].field0 + _vm->_globals.Cache[idx].field6,
            _vm->_globals.Cache[idx].field4 + _vm->_globals.Cache[idx].field8);
 }
@@ -1023,14 +1023,14 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 	int v6;
 	int v7;
 	int v8;
-	int v9; 
-	int v10; 
-	int v11; 
-	int v12; 
-	int v13; 
+	int v9;
+	int v10;
+	int v11;
+	int v12;
+	int v13;
 	int v15;
 	int v16;
-	int v17; 
+	int v17;
 	int v22;
 
 	Sprite[idx].field2A = 0;
@@ -1047,13 +1047,13 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 			v4 = Sprite[idx].field12 + v3;
 			v6 = get_offsety(Sprite[idx].spriteData, Sprite[idx].spriteIndex, 0);
 		}
-    
+
 		v9 = Sprite[idx].field14 + v6;
 		v7 = v9;
 		v8 = v9;
 		int zoomPercent = 0;
 		int reducePercent = 0;
-    
+
 		v9 = Sprite[idx].fieldC;
 		if (v9 < 0) {
 			v9 = -v9;
@@ -1063,19 +1063,19 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 		}
 		if (Sprite[idx].fieldC > 0)
 			zoomPercent = Sprite[idx].fieldC;
-    
+
 		if (zoomPercent) {
 			if (v4 >= 0) {
 				v22 = _vm->_graphicsManager.Reel_Zoom(v4, zoomPercent);
 			} else {
 				v10 = v4;
-        
+
 				if (v4 < 0)
 					v10 = -v4;
 				v4 = v10;
 				v22 = -_vm->_graphicsManager.Reel_Zoom(v10, zoomPercent);
 			}
-      
+
 			if (v8 >= 0) {
 				v7 = _vm->_graphicsManager.Reel_Zoom(v8, zoomPercent);
 			} else {
@@ -1105,7 +1105,7 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 				v7 = -_vm->_graphicsManager.Reel_Reduc(v13, reducePercent);
 			}
 		}
-    
+
 		v15 = Sprite[idx].spritePos.x - v22;
 		v16 = Sprite[idx].spritePos.y - v7;
 		Sprite[idx].field2C = v15;
@@ -1113,7 +1113,7 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 		Sprite[idx].field2A = 1;
 		Sprite[idx].field34 = zoomPercent;
 		Sprite[idx].field36 = reducePercent;
-	
+
 		v17 = idx;
 		_vm->_globals.Liste[v17].field0 = 1;
 		_vm->_globals.Liste[v17].field2 = v15;
@@ -1125,12 +1125,12 @@ void ObjectsManager::CALCUL_SPRITE(int idx) {
 			width = _vm->_graphicsManager.Reel_Zoom(width, zoomPercent);
 			height = _vm->_graphicsManager.Reel_Zoom(height, zoomPercent);
 		}
-    
+
 		if (reducePercent) {
 			height = _vm->_graphicsManager.Reel_Reduc(height, reducePercent);
 			width = _vm->_graphicsManager.Reel_Reduc(width, reducePercent);
 		}
-    
+
 		Sprite[idx].field30 = width;
 		Sprite[idx].field32 = height;
 	}
@@ -1143,12 +1143,12 @@ int ObjectsManager::AvantTri(TriMode triMode, int index, int priority) {
 	++_vm->_globals.NBTRI;
 	if (_vm->_globals.NBTRI > 48)
 		error("NBTRI too high");
-  
+
 	result = _vm->_globals.NBTRI;
 	_vm->_globals.Tri[result].triMode = triMode;
 	_vm->_globals.Tri[result].index = index;
 	_vm->_globals.Tri[result].priority = priority;
-  
+
 	return result;
 }
 
@@ -1162,14 +1162,14 @@ void ObjectsManager::AFF_BOB_ANIM() {
 	int v8;
 	int v10;
 	int v11;
-	int v12; 
-	int v13; 
+	int v12;
+	int v13;
 	int v14;
 	int v18;
 	int v19;
-	byte *v20; 
-	byte *v21; 
-	int v22; 
+	byte *v20;
+	byte *v21;
+	int v22;
 	int v24;
 	int v26;
 	int v27;
@@ -1182,7 +1182,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
 			_vm->_globals.Bob[idx].field1C = 0;
 			continue;
 		}
-    
+
 		if (_vm->_globals.Bob[idx].field0 == 10) {
 			_vm->_globals.Bob[idx].field1C = 0;
 			v1 = _vm->_globals.Bob[idx].field20;
@@ -1190,7 +1190,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
 				v1 = 50;
 			if (_vm->_globals.Bob[idx].animData == g_PTRNUL || _vm->_globals.Bob[idx].field16 || v1 <= 0)
 				goto LABEL_38;
-      
+
 			v2 = _vm->_globals.Bob[idx].field14;
 			if (_vm->_globals.Bob[idx].field12 == v2) {
 				_vm->_globals.Bob[idx].field1C = 1;
@@ -1198,10 +1198,10 @@ void ObjectsManager::AFF_BOB_ANIM() {
 				_vm->_globals.Bob[idx].field14 = v2 + 1;
 				_vm->_globals.Bob[idx].field1C = 0;
 			}
-      
+
 			if (_vm->_globals.Bob[idx].field1C != 1)
 				goto LABEL_38;
-      
+
 			v20 = _vm->_globals.Bob[idx].animData + 20;
 			v24 = _vm->_globals.Bob[idx].field10;
 			_vm->_globals.Bob[idx].xp = (int16)READ_LE_UINT16(v20 + 2 * v24);
@@ -1209,7 +1209,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
 				_vm->_globals.Bob[idx].xp = _vm->_globals.BL_ANIM[idx].v2;
 			if ( PERSO_ON == true && idx > 20 )
 				_vm->_globals.Bob[idx].xp += _vm->_eventsManager._startPos.x;
-      
+
 			_vm->_globals.Bob[idx].yp = (int16)READ_LE_UINT16(v20 + 2 * v24 + 2);
 			_vm->_globals.Bob[idx].field12 = (int16)READ_LE_UINT16(v20 + 2 * v24 + 4);
 			_vm->_globals.Bob[idx].field36 = (int16)READ_LE_UINT16(v20 + 2 * v24 + 6);
@@ -1217,7 +1217,7 @@ void ObjectsManager::AFF_BOB_ANIM() {
 			_vm->_globals.Bob[idx].field38 = *(v20 + 2 * v24 + 9);
 			_vm->_globals.Bob[idx].field10 += 5;
 			v5 = _vm->_globals.Bob[idx].field12;
-			
+
 			if (v5 > 0) {
 				v6 = v5 / _vm->_globals.vitesse;
 				_vm->_globals.Bob[idx].field12 = v5 / _vm->_globals.vitesse;
@@ -1226,12 +1226,12 @@ LABEL_37:
 					_vm->_globals.Bob[idx].field14 = 1;
 LABEL_38:
 					v12 = idx;
-          
+
 					if ((unsigned int)(_vm->_globals.Bob[v12].field1E - 1) <= 1u)
 						_vm->_globals.Bob[v12].field1C = 1;
 					continue;
 				}
-        
+
 				_vm->_globals.Bob[idx].field12 = 1;
 			}
 			if (!_vm->_globals.Bob[idx].field12) {
@@ -1245,7 +1245,7 @@ LABEL_38:
 					_vm->_globals.Bob[idx].field10 = 0;
 					v21 = _vm->_globals.Bob[idx].animData + 20;
 					_vm->_globals.Bob[idx].xp = (int16)READ_LE_UINT16(v21);
-					
+
 					if (_vm->_globals.BL_ANIM[idx].v1 == 1)
 						_vm->_globals.Bob[idx].xp = _vm->_globals.BL_ANIM[idx].v2;
 					if (PERSO_ON == true && idx > 20)
@@ -1258,7 +1258,7 @@ LABEL_38:
 					_vm->_globals.Bob[idx].field38 = *(v21 + 9);
 					_vm->_globals.Bob[idx].field10 += 5;
 					v10 = _vm->_globals.Bob[idx].field12;
-			
+
 					if (v10 > 0) {
 						v11 = v10 / _vm->_globals.vitesse;
 						_vm->_globals.Bob[idx].field12 = v10 / _vm->_globals.vitesse;
@@ -1268,7 +1268,7 @@ LABEL_38:
 					}
 				}
 			}
-			
+
 			goto LABEL_37;
 		}
 	} while (idx != 35);
@@ -1282,17 +1282,17 @@ LABEL_38:
 			++v26;
 		} while (v26 != 35);
 	}
-  
+
 	BOBTOUS = false;
 	v27 = 0;
-  
+
 	do {
 		++v27;
 		if (v27 > 20 || PERSO_ON != true) {
 			if (_vm->_globals.Bob[v27].field0 == 10) {
 				if (_vm->_globals.Bob[v27].field1C == 1) {
 					v14 = _vm->_globals.Bob[v27].field1E;
-          
+
 					if (v14 != 2) {
 						if (v14 != 4) {
 							if (_vm->_globals.Liste2[v27].field0) {
@@ -1307,7 +1307,7 @@ LABEL_38:
 					}
 				}
 			}
-      
+
 			v22 = v27;
 			if (_vm->_globals.Bob[v22].field0 == 11) {
 				if (_vm->_globals.Liste2[v27].field0) {
@@ -1318,12 +1318,12 @@ LABEL_38:
 						_vm->_globals.Liste2[v27].xp, _vm->_globals.Liste2[v27].yp);
 					_vm->_globals.Liste2[v27].field0 = 0;
 				}
-        
+
 				_vm->_globals.Bob[v22].field0 = 0;
 			}
 		}
 	} while (v27 != 35);
-  
+
 	v28 = 0;
 	do {
 		++v28;
@@ -1333,7 +1333,7 @@ LABEL_38:
 			CALCUL_BOB(v28);
 			int v = _vm->_globals.Bob[v18].oldHeight + _vm->_globals.Bob[v18].oldY;
 			v19 = _vm->_globals.Bob[v18].oldX2 + v;
-		
+
 			if (v19 > 450)
 				v19 = 600;
 
@@ -1345,18 +1345,18 @@ LABEL_38:
 
 // Display VBOB
 void ObjectsManager::AFF_VBOB() {
-	int width, height; 
+	int width, height;
 
 	int idx = 0;
 	do {
 		if (_vm->_globals.VBob[idx].field4 == 4) {
 			width = getWidth(_vm->_globals.VBob[idx].spriteData, _vm->_globals.VBob[idx].frameIndex);
 			height = getHeight(_vm->_globals.VBob[idx].spriteData, _vm->_globals.VBob[idx].frameIndex);
-			
-			_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_SCREEN, 
+
+			_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_SCREEN,
 				_vm->_globals.VBob[idx].surface, _vm->_globals.VBob[idx].xp,
 				_vm->_globals.VBob[idx].yp, width, height);
-      
+
 			_vm->_graphicsManager.Restore_Mem(
 				_vm->_graphicsManager.VESA_BUFFER, _vm->_globals.VBob[idx].surface,
 				_vm->_globals.VBob[idx].xp, _vm->_globals.VBob[idx].yp,
@@ -1365,9 +1365,9 @@ void ObjectsManager::AFF_VBOB() {
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(
 				_vm->_globals.VBob[idx].xp, _vm->_globals.VBob[idx].yp,
 				_vm->_globals.VBob[idx].xp + width, height + _vm->_globals.VBob[idx].yp);
-      
+
 			_vm->_globals.VBob[idx].surface = _vm->_globals.freeMemory(_vm->_globals.VBob[idx].surface);
-      
+
 			_vm->_globals.VBob[idx].field4 = 0;
 			_vm->_globals.VBob[idx].spriteData = g_PTRNUL;
 			_vm->_globals.VBob[idx].xp = 0;
@@ -1382,25 +1382,25 @@ void ObjectsManager::AFF_VBOB() {
 		if (_vm->_globals.VBob[idx].field4 == 3) {
 			width = getWidth(_vm->_globals.VBob[idx].oldSpriteData, _vm->_globals.VBob[idx].oldFrameIndex);
 			height = getHeight(_vm->_globals.VBob[idx].oldSpriteData, _vm->_globals.VBob[idx].oldFrameIndex);
-      
+
 			_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_SCREEN,
 				_vm->_globals.VBob[idx].surface, _vm->_globals.VBob[idx].oldX,
 				_vm->_globals.VBob[idx].oldY,
 				width, height);
-      
+
 			_vm->_graphicsManager.Restore_Mem(_vm->_graphicsManager.VESA_BUFFER,
 				_vm->_globals.VBob[idx].surface, _vm->_globals.VBob[idx].oldX,
 				_vm->_globals.VBob[idx].oldY, width, height);
-      
+
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_globals.VBob[idx].oldX,
 				_vm->_globals.VBob[idx].oldY, _vm->_globals.VBob[idx].oldX + width,
 				_vm->_globals.VBob[idx].oldY + height);
-      
+
 			_vm->_globals.VBob[idx].field4 = 1;
 			_vm->_globals.VBob[idx].oldSpriteData = _vm->_globals.VBob[idx].spriteData;
-      
+
 			_vm->_globals.VBob[idx].surface = _vm->_globals.freeMemory(_vm->_globals.VBob[idx].surface);
-      
+
 			_vm->_globals.VBob[idx].oldX = _vm->_globals.VBob[idx].xp;
 			_vm->_globals.VBob[idx].oldY = _vm->_globals.VBob[idx].yp;
 			_vm->_globals.VBob[idx].oldFrameIndex = _vm->_globals.VBob[idx].frameIndex;
@@ -1409,22 +1409,22 @@ void ObjectsManager::AFF_VBOB() {
 		if (_vm->_globals.VBob[idx].field4 == 1) {
 			width = getWidth(_vm->_globals.VBob[idx].spriteData, _vm->_globals.VBob[idx].frameIndex);
 			height = getHeight(_vm->_globals.VBob[idx].spriteData, _vm->_globals.VBob[idx].frameIndex);
-      
+
 			_vm->_globals.VBob[idx].surface = _vm->_globals.freeMemory(_vm->_globals.VBob[idx].surface);
-      
+
 			byte *surface = _vm->_globals.allocMemory(height * width);
 			_vm->_globals.VBob[idx].surface = surface;
-      
-			_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager.VESA_SCREEN, surface, 
+
+			_vm->_graphicsManager.Capture_Mem(_vm->_graphicsManager.VESA_SCREEN, surface,
 				_vm->_globals.VBob[idx].xp, _vm->_globals.VBob[idx].yp, width, height);
-      
+
 			byte *v10 = _vm->_globals.VBob[idx].spriteData;
 			if (*v10 == 78) {
-				_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_SCREEN, v10, 
+				_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_SCREEN, v10,
 					_vm->_globals.VBob[idx].xp + 300, _vm->_globals.VBob[idx].yp + 300,
 					_vm->_globals.VBob[idx].frameIndex,
 					0, 0, 0);
-        
+
 				_vm->_graphicsManager.Affiche_Perfect(_vm->_graphicsManager.VESA_BUFFER,
 					_vm->_globals.VBob[idx].spriteData,
 					_vm->_globals.VBob[idx].xp + 300, _vm->_globals.VBob[idx].yp + 300,
@@ -1434,12 +1434,12 @@ void ObjectsManager::AFF_VBOB() {
 				_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_BUFFER,
 					v10, _vm->_globals.VBob[idx].xp + 300, _vm->_globals.VBob[idx].yp + 300,
 					_vm->_globals.VBob[idx].frameIndex);
-        
+
 				_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager.VESA_SCREEN, _vm->_globals.VBob[idx].spriteData,
 					_vm->_globals.VBob[idx].xp + 300, _vm->_globals.VBob[idx].yp + 300,
 					_vm->_globals.VBob[idx].frameIndex);
 			}
-      
+
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(_vm->_globals.VBob[idx].xp,
 				_vm->_globals.VBob[idx].yp , _vm->_globals.VBob[idx].xp + width,
 				_vm->_globals.VBob[idx].yp + height);
@@ -1491,7 +1491,7 @@ void ObjectsManager::CLEAR_SPR() {
 void ObjectsManager::SPRITE_ON(int idx) {
 	if (idx > 5)
 		error("Attempt to display a sprite > MAX_SPRITE.");
-  
+
 	Sprite[idx].field0 = 1;
 }
 
@@ -1595,7 +1595,7 @@ void ObjectsManager::SETYSPR(int idx, int yp) {
 void ObjectsManager::SETTAILLESPR(int idx, int a2) {
 	if (idx > 5)
 		error("Set the Coord. there a sprite> MAX_SPRITE.");
-  
+
 	if (Sprite[idx].field28 != 1)
 		Sprite[idx].fieldC = a2;
 }
@@ -1610,7 +1610,7 @@ void ObjectsManager::SETFLIPSPR(int idx, int a2) {
 
 void ObjectsManager::VERIFZONE() {
 	int v0;
-	int v1; 
+	int v1;
 	int v2;
 	uint16 v3;
 	int v4;
@@ -1678,7 +1678,7 @@ LABEL_54:
 					_vm->_globals.force_to_data_0 += 25;
 					if (_vm->_globals.force_to_data_0 > 100)
 						_vm->_globals.force_to_data_0 = 0;
-					_vm->_graphicsManager.SETCOLOR4(251, _vm->_globals.force_to_data_0, _vm->_globals.force_to_data_0, 
+					_vm->_graphicsManager.SETCOLOR4(251, _vm->_globals.force_to_data_0, _vm->_globals.force_to_data_0,
 						_vm->_globals.force_to_data_0);
 					if (_vm->_eventsManager._mouseCursorId == 4) {
 						v1 = 5 * v4;
@@ -1715,60 +1715,60 @@ LABEL_54:
 }
 
 void ObjectsManager::GOHOME() {
-	int16 v0; 
-	int16 v1; 
-	int16 v3; 
-	int16 v4; 
+	int16 v0;
+	int16 v1;
+	int16 v3;
+	int16 v4;
 	unsigned int v5;
 	unsigned int v6;
 	unsigned int v7;
 	unsigned int v8;
-	int16 v9; 
+	int16 v9;
 	int16 v10;
 	unsigned int v11;
 	unsigned int v12;
 	unsigned int v13;
 	unsigned int v14;
-	int v15; 
-	int16 v16; 
-	unsigned int v17; 
-	unsigned int v18; 
-	int v19; 
-	int16 v20; 
-	unsigned int v21; 
-	unsigned int v22; 
-	int16 v23; 
-	int16 v24; 
-	unsigned int v25; 
-	unsigned int v26; 
-	unsigned int v27; 
-	unsigned int v28; 
-	int16 v29; 
-	int16 v30; 
+	int v15;
+	int16 v16;
+	unsigned int v17;
+	unsigned int v18;
+	int v19;
+	int16 v20;
+	unsigned int v21;
+	unsigned int v22;
+	int16 v23;
+	int16 v24;
+	unsigned int v25;
+	unsigned int v26;
+	unsigned int v27;
+	unsigned int v28;
+	int16 v29;
+	int16 v30;
 	unsigned int v31;
 	unsigned int v32;
 	unsigned int v33;
-	unsigned int v34; 
+	unsigned int v34;
 	int16 v35;
 	int16 v36;
 	unsigned int v37;
 	unsigned int v38;
 	unsigned int v39;
 	unsigned int v40;
-	int16 v41; 
-	int16 v42; 
+	int16 v41;
+	int16 v42;
 	unsigned int v43;
 	unsigned int v44;
 	unsigned int v45;
 	unsigned int v46;
 	int16 v47;
-	int16 v48; 
-	int16 v49; 
-	int v50; 
+	int16 v48;
+	int16 v49;
+	int v50;
 	int16 v51;
 	int16 v52;
 	int16 v54;
-	int v55; 
+	int v55;
 	int16 v56;
 	int16 v57;
 	int16 v58;
@@ -2250,7 +2250,7 @@ LABEL_153:
 }
 
 void ObjectsManager::GOHOME2() {
-	int16 v2; 
+	int16 v2;
 
 	if (_vm->_globals.chemin != (int16 *)g_PTRNUL) {
 		int v0 = 2;
@@ -2289,7 +2289,7 @@ void ObjectsManager::GOHOME2() {
 				SETANISPR(0, 2);
 			if (_vm->_globals.last_sens == 7)
 				SETANISPR(0, 3);
-			
+
 			_vm->_globals.chemin = (int16 *)g_PTRNUL;
 			my_anim = 0;
 			A_ANIM = 0;
@@ -2316,10 +2316,10 @@ LABEL_19:
 
 // Load Obstacle
 void ObjectsManager::CHARGE_OBSTACLE(const Common::String &file) {
-	int16 v1; 
-	byte *ptr; 
-	int16 v4; 
-	int16 v5; 
+	int16 v1;
+	byte *ptr;
+	int16 v4;
+	int16 v5;
 
 	_vm->_linesManager.RESET_OBSTACLE();
 	_vm->_linesManager.TOTAL_LIGNES = 0;
@@ -2350,24 +2350,24 @@ void ObjectsManager::CHARGE_OBSTACLE(const Common::String &file) {
 
 // Load Zone
 void ObjectsManager::CHARGE_ZONE(const Common::String &file) {
-	signed int v1; 
-	int v2; 
-	int v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int16 v7; 
-	int v8; 
-	byte *v9; 
-	int v10; 
-	signed int v11; 
-	int v12; 
-	byte *v13; 
-	int v14; 
-	signed int v15; 
-	int16 v17; 
-	int16 v18; 
-	byte *ptr; 
+	signed int v1;
+	int v2;
+	int v3;
+	int v4;
+	int v5;
+	int v6;
+	int16 v7;
+	int v8;
+	byte *v9;
+	int v10;
+	signed int v11;
+	int v12;
+	byte *v13;
+	int v14;
+	signed int v15;
+	int16 v17;
+	int16 v18;
+	byte *ptr;
 
 	v1 = 1;
 	do {
@@ -2391,7 +2391,7 @@ void ObjectsManager::CHARGE_ZONE(const Common::String &file) {
 	} while (v1 <= 100);
 
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, file);
-	
+
 	Common::File f;
 	if (!f.exists(_vm->_globals.NFICHIER))
 		error("File not found : %s", _vm->_globals.NFICHIER.c_str());
@@ -2463,14 +2463,14 @@ void ObjectsManager::CHARGE_ZONE(const Common::String &file) {
 // Square Zone
 void ObjectsManager::CARRE_ZONE() {
 	int16 *dataP;
-	int v4; 
-	int v5; 
-	int v7; 
-	int v8; 
-	int v10; 
-	int v11; 
-	int v12; 
-	int v13; 
+	int v4;
+	int v5;
+	int v7;
+	int v8;
+	int v10;
+	int v11;
+	int v12;
+	int v13;
 	int v14;
 
 	for (int idx = 0; idx < 100; ++idx) {
@@ -2571,7 +2571,7 @@ void ObjectsManager::PLAN_BETA() {
 	_vm->_globals.CACHE_OFF(19);
 	_vm->_globals.CACHE_OFF(20);
 	_vm->_globals.CACHE_ON();
-	
+
 	if (!_vm->_globals.PLANX && !_vm->_globals.PLANY) {
 		_vm->_globals.PLANX = 900;
 		_vm->_globals.PLANY = 319;
@@ -2591,19 +2591,19 @@ void ObjectsManager::PLAN_BETA() {
 	_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
 	_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 	_vm->_globals.BPP_NOAFF = true;
-	
+
 	v4 = 0;
 	do {
 		_vm->_eventsManager.VBL();
 		++v4;
 	} while (v4 <= 4);
-  
+
 	_vm->_globals.BPP_NOAFF = false;
 	_vm->_globals.iRegul = 1;
 	_vm->_graphicsManager.FADE_INW();
 	_vm->_eventsManager.changeMouseCursor(4);
 	_vm->_graphicsManager.NOFADE = false;
-  
+
 	do {
 		v5 = _vm->_eventsManager.getMouseButton();
 		if (v5) {
@@ -2625,14 +2625,14 @@ void ObjectsManager::PLAN_BETA() {
 			if (v5 == 1)
 				BTGAUCHE();
 		}
-    
+
 		VERIFZONE();
 		GOHOME2();
-		
+
 		if (_vm->_globals.chemin == (int16 *)g_PTRNUL && _vm->_globals.GOACTION == 1)
 			PARADISE();
 		_vm->_eventsManager.VBL();
-    
+
 		if (_vm->_globals.SORTIE)
 			v1 = 1;
 	} while (!_vm->shouldQuit() && v1 != 1);
@@ -2650,7 +2650,7 @@ void ObjectsManager::PLAN_BETA() {
 	CLEAR_ECRAN();
 	_vm->_globals.NOSPRECRAN = false;
 	_vm->_globals.PLAN_FLAG = false;
-}	
+}
 
 // Left Button
 void ObjectsManager::BTGAUCHE() {
@@ -2658,18 +2658,18 @@ void ObjectsManager::BTGAUCHE() {
 	int destX, destY;
 	int v1;
 	int v2;
-	int16 *v3; 
-	int16 *v4; 
-	int16 *v5; 
-	int zoneCount; 
+	int16 *v3;
+	int16 *v4;
+	int16 *v5;
+	int zoneCount;
 	int zoneX;
 	int zoneY;
-	int16 *v9; 
+	int16 *v9;
 	int v10;
 	int v11;
 	int v12;
-	int16 *v13; 
-	int16 *v16; 
+	int16 *v13;
+	int16 *v16;
 	int v17;
 	int v18;
 
@@ -2833,8 +2833,8 @@ LABEL_65:
 		ARRET_PERSO_FLAG = 1;
 		ARRET_PERSO_NUM = _vm->_globals.BOBZONE[NUMZONE];
 	}
-	if (_vm->_globals.ECRAN == 20 && _vm->_globals.SAUVEGARDE->data[svField132] == 1 
-				&& _vm->_globals.OBJET_EN_COURS == 20 && NUMZONE == 12 
+	if (_vm->_globals.ECRAN == 20 && _vm->_globals.SAUVEGARDE->data[svField132] == 1
+				&& _vm->_globals.OBJET_EN_COURS == 20 && NUMZONE == 12
 				&& _vm->_eventsManager._mouseCursorId == 23) {
 		// Special case for throwing darts at the switch in Purgatory - the player shouldn't move
 		_vm->_globals.chemin = (int16 *)g_PTRNUL;
@@ -2846,8 +2846,8 @@ LABEL_65:
 void ObjectsManager::PARADISE() {
 	int v1;
 	char result;
-	int v3; 
-	int v5; 
+	int v3;
+	int v5;
 
 	v1 = 0;
 	ARRET_PERSO_FLAG = 0;
@@ -3013,7 +3013,7 @@ void ObjectsManager::CLEAR_ECRAN() {
 
 // Change Face/Head
 void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter newCharacter) {
-	CharacterLocation *loc; 
+	CharacterLocation *loc;
 
 	CH_TETE = 1;
 	_vm->_graphicsManager.SCOPY(_vm->_graphicsManager.VESA_SCREEN, 532, 25, 65, 40, _vm->_graphicsManager.VESA_BUFFER, 532, 25);
@@ -3021,7 +3021,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
 	_vm->_globals.NOT_VERIF = 1;
 	_vm->_globals.chemin = (int16 *)g_PTRNUL;
 
-	if (oldCharacter == CHARACTER_SAMANTHA && newCharacter == CHARACTER_HOPKINS 
+	if (oldCharacter == CHARACTER_SAMANTHA && newCharacter == CHARACTER_HOPKINS
 		&& _vm->_globals.SAUVEGARDE->realHopkins.location == _vm->_globals.ECRAN) {
 		CH_TETE = 0;
 		loc = &_vm->_globals.SAUVEGARDE->samantha;
@@ -3048,7 +3048,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
 		SPRITE(_vm->_globals.PERSO, loc->xp, loc->yp, 0, 64, loc->field4, 0, 34, 190);
 		SPRITE_ON(0);
 		_vm->_globals.HOPKINS_DATA();
-	} else if (oldCharacter == CHARACTER_HOPKINS && newCharacter == CHARACTER_SAMANTHA 
+	} else if (oldCharacter == CHARACTER_HOPKINS && newCharacter == CHARACTER_SAMANTHA
 			&& _vm->_globals.SAUVEGARDE->samantha.location == _vm->_globals.ECRAN) {
 		CH_TETE = 0;
 		loc = &_vm->_globals.SAUVEGARDE->realHopkins;
@@ -3057,7 +3057,7 @@ void ObjectsManager::CHANGE_TETE(PlayerCharacter oldCharacter, PlayerCharacter n
 		loc->field2 = 64;
 		loc->location = _vm->_globals.ECRAN;
 		loc->field4 = Sprite[0].fieldC;
-		
+
 		SPRITE_OFF(1);
 		SPRITE(_vm->_globals.TETE, loc->xp, loc->yp, 1, 2, loc->field4, 0, 34, 190);
 		SPRITE_ON(1);
@@ -3153,9 +3153,9 @@ void ObjectsManager::PACOURS_PROPRE(int16 *a1) {
 	int v4;
 	int v5;
 	int v6;
-	int v7; 
-	int v8; 
-	int v9; 
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
@@ -3230,59 +3230,59 @@ int16 *ObjectsManager::PARC_VOITURE(int a1, int a2, int a3, int a4) {
 	int v10;
 	int v11;
 	int v12;
-	int v13; 
-	int v14; 
-	int v15; 
+	int v13;
+	int v14;
+	int v15;
 	int v16;
-	int v17; 
-	int v18; 
-	int v19; 
+	int v17;
+	int v18;
+	int v19;
 	int v20;
-	int v21; 
+	int v21;
 	int16 *result;
 	int v23;
-	int v24; 
-	int v25; 
+	int v24;
+	int v25;
 	int v26;
-	int v27; 
+	int v27;
 	int v28;
 	int v29;
-	int v30; 
-	int v31; 
-	int v32; 
+	int v30;
+	int v31;
+	int v32;
 	int16 *v33;
-	int v34; 
-	int v35; 
-	int i; 
-	int16 *v37; 
-	int v39; 
+	int v34;
+	int v35;
+	int i;
+	int16 *v37;
+	int v39;
 	int v40;
-	int16 *v41; 
-	int v43; 
+	int16 *v41;
+	int v43;
 	int k;
-	int16 *v45; 
-	int v47; 
-	int v48; 
+	int16 *v45;
+	int v47;
+	int v48;
 	int v49;
-	int16 *v50; 
-	int v52; 
+	int16 *v50;
+	int v52;
 	int v53;
-	int16 *v54; 
-	int v56; 
+	int16 *v54;
+	int v56;
 	int v57;
-	int16 *v58; 
-	int v60; 
-	int v61; 
+	int16 *v58;
+	int v60;
+	int v61;
 	int v62;
 	int v63;
 	int v64;
 	int v65;
-	int v66; 
-	int v67; 
-	int v68; 
-	int v69; 
-	int j; 
-	int l; 
+	int v66;
+	int v67;
+	int v68;
+	int v69;
+	int j;
+	int l;
 	int v72;
 	int v73;
 	int v74;
@@ -3808,19 +3808,19 @@ int ObjectsManager::MZONE() {
 	signed int result;
 	int16 v1;
 	int16 v2;
-	int v3; 
+	int v3;
 	int16 v4;
 	int16 v5;
-	int v6; 
+	int v6;
 	int16 v7;
-	int v8; 
-	int v9; 
+	int v8;
+	int v9;
 	int16 yCurrent;
 	int16 v11;
-	int16 j; 
-	int16 k; 
-	int16 xCurrent; 
-	int v15; 
+	int16 j;
+	int16 k;
+	int16 xCurrent;
+	int v15;
 	int16 v16;
 	int16 v17;
 	int16 v18;
@@ -4097,7 +4097,7 @@ void ObjectsManager::VALID_OBJET(int a1) {
 }
 
 void ObjectsManager::OPTI_OBJET() {
-	byte *data; 
+	byte *data;
 	Common::String file;
 	int v0 = 1;
 	int v5;
@@ -4109,7 +4109,7 @@ void ObjectsManager::OPTI_OBJET() {
 		_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, file);
 		data = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
 	}
-	
+
 	if ((data == g_PTRNUL) || *data != 'I' || *(data + 1) != 'N' || *(data + 2) != 'I') {
 		error("Not an INI file");
 	} else {
@@ -4195,7 +4195,7 @@ void ObjectsManager::SPECIAL_JEU() {
 					_vm->_globals.NECESSAIRE = true;
 					_vm->_graphicsManager.NB_SCREEN();
 					_vm->_globals.NECESSAIRE = false;
-					
+
 					_vm->_saveLoadManager.bload("TEMP1.SCR", _vm->_graphicsManager.VESA_SCREEN);
 					g_system->getSavefileManager()->removeSavefile("TEMP1.SCR");
 
@@ -4272,8 +4272,8 @@ void ObjectsManager::SPECIAL_JEU() {
 void ObjectsManager::BOB_VIVANT(int idx) {
 	int v1;
 	int v2;
-	int v3; 
-	int v4; 
+	int v3;
+	int v4;
 
 	v1 = 5 * idx;
 	v2 = (int16)READ_LE_UINT16(_vm->_talkManager.ADR_ANIM + 2 * v1);
@@ -4281,8 +4281,8 @@ void ObjectsManager::BOB_VIVANT(int idx) {
 	v4 = *(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8);
 	if ((int16)READ_LE_UINT16(_vm->_talkManager.ADR_ANIM + 2 * v1 + 4)) {
 		if (!_vm->_globals.NO_OFFSET)
-			_vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager.PERSOSPR, 
-				_vm->_graphicsManager.ofscroll + v2, v3, 
+			_vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager.PERSOSPR,
+				_vm->_graphicsManager.ofscroll + v2, v3,
 				*(_vm->_talkManager.ADR_ANIM + 2 * v1 + 8));
 		if (_vm->_globals.NO_OFFSET)
 			_vm->_graphicsManager.AFFICHE_SPEED(_vm->_talkManager.PERSOSPR, v2, v3, v4);
@@ -4292,7 +4292,7 @@ void ObjectsManager::BOB_VIVANT(int idx) {
 void ObjectsManager::VBOB(byte *src, int idx, int xp, int yp, int frameIndex) {
 	if (idx > 29)
 		error("MAX_VBOB exceeded");
-	
+
 	if (_vm->_globals.VBob[idx].field4 <= 1) {
 		_vm->_globals.VBob[idx].field4 = 1;
 		_vm->_globals.VBob[idx].xp = xp;
@@ -4305,7 +4305,7 @@ void ObjectsManager::VBOB(byte *src, int idx, int xp, int yp, int frameIndex) {
 		_vm->_globals.VBob[idx].oldSpriteData = src;
 		_vm->_globals.VBob[idx].surface = _vm->_globals.freeMemory(_vm->_globals.VBob[idx].surface);
 	}
-	
+
 	int f4 = _vm->_globals.VBob[idx].field4;
 	if (f4 == 2 || f4 == 4) {
 		_vm->_globals.VBob[idx].field4 = 3;
@@ -4323,7 +4323,7 @@ void ObjectsManager::VBOB(byte *src, int idx, int xp, int yp, int frameIndex) {
 void ObjectsManager::VBOB_OFF(int idx) {
 	if (idx > 29)
 		error("MAX_VBOB exceeded");
-	
+
 	if (_vm->_globals.VBob[idx].field4 <= 1)
 		_vm->_globals.VBob[idx].field4 = 0;
 	else
@@ -4529,7 +4529,7 @@ void ObjectsManager::OPTI_ONE(int idx, int a2, int a3, int a4) {
 	if (!a4)
 		BOBANIM_OFF(idx);
 	if (a4 == 4) {
-		_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.Bob[idx].spriteData, 
+		_vm->_graphicsManager.AFFICHE_SPEED(_vm->_globals.Bob[idx].spriteData,
 			_vm->_globals.Bob[idx].oldX, _vm->_globals.Bob[idx].oldY, _vm->_globals.Bob[idx].frameIndex);
 		BOBANIM_OFF(idx);
 		_vm->_eventsManager.VBL();
@@ -4585,8 +4585,8 @@ int ObjectsManager::BOBA(int idx) {
 void ObjectsManager::INILINK(const Common::String &file) {
 	int v1;
 	int v2;
-	int v8; 
-	int v9; 
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
@@ -4618,7 +4618,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
 	size_t v41;
 	size_t v42;
 	size_t nbytes;
-	byte *ptr; 
+	byte *ptr;
 	Common::String filename, filename2;
 	Common::File f;
 
@@ -4630,7 +4630,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
 	nbytes = _vm->_globals.CAT_TAILLE;
 	if (ptr == g_PTRNUL) {
 		_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, filename);
-		
+
 		if (!f.open(_vm->_globals.NFICHIER))
 			error("Error opening file - %s", _vm->_globals.NFICHIER.c_str());
 
@@ -4646,11 +4646,11 @@ void ObjectsManager::INILINK(const Common::String &file) {
 			_vm->_globals.STAILLE[idx] = (int16)READ_LE_UINT16((uint16 *)ptr + idx);
 
 		_vm->_globals.RESET_CACHE();
-		
+
 		filename2 = Common::String((const char *)ptr + 1000);
 		if (!filename2.empty()) {
 			_vm->_globals.CACHE_BANQUE[1] = _vm->_fileManager.searchCat(filename2, 8);
-			
+
 			if (_vm->_globals.CACHE_BANQUE[1] || _vm->_globals.CACHE_BANQUE[1] == g_PTRNUL) {
 				_vm->_globals.CAT_FLAG = false;
 				_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, filename2);
@@ -4676,7 +4676,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
 				_vm->_globals.Cache[v11].field0 = v9;
 				_vm->_globals.Cache[v11].field4 = v10;
 				_vm->_globals.Cache[v11].field12 = 1;
-				
+
 				if (!_vm->_globals.CACHE_BANQUE[1]) {
 					_vm->_globals.Cache[v40].fieldA = 0;
 				} else {
@@ -4689,7 +4689,7 @@ void ObjectsManager::INILINK(const Common::String &file) {
 					_vm->_globals.Cache[v40].field8 = v15;
 					_vm->_globals.Cache[v40].fieldA = 1;
 				}
-				if (!_vm->_globals.Cache[v40].field0 && !_vm->_globals.Cache[v40].field4 
+				if (!_vm->_globals.Cache[v40].field0 && !_vm->_globals.Cache[v40].field4
 							&& !_vm->_globals.Cache[v40].field2)
 					_vm->_globals.Cache[v40].fieldA = 0;
 
@@ -4814,16 +4814,16 @@ void ObjectsManager::INILINK(const Common::String &file) {
 			} while (nbytes > v42);
 		}
 	}
-	_vm->_globals.freeMemory(ptr);	
+	_vm->_globals.freeMemory(ptr);
 }
 
 void ObjectsManager::SPECIAL_INI(const Common::String &a1) {
-	int v2; 
-	int v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
+	int v2;
+	int v3;
+	int v4;
+	int v5;
+	int v6;
+	int v7;
 
 	if (_vm->_globals.ECRAN == 73 && !_vm->_globals.SAUVEGARDE->data[svField318]) {
 		_vm->_globals.CACHE_SUB(0);
@@ -5086,10 +5086,10 @@ void ObjectsManager::VERBE_ON(int idx, int a2) {
 }
 
 int ObjectsManager::CALC_PROPRE(int idx) {
-	int v1; 
-	int v2; 
-	int v3; 
-	int v4; 
+	int v1;
+	int v2;
+	int v3;
+	int v4;
 
 	v1 = 25;
 	v2 = _vm->_globals.STAILLE[idx];
@@ -5164,19 +5164,19 @@ int ObjectsManager::colision(int xp, int yp) {
 }
 
 void ObjectsManager::ACTION(const byte *spriteData, const Common::String &a2, int a3, int a4, int a5, int a6) {
-	int v6; 
-	int v7; 
-	char v8; 
-	int v9; 
-	int v10; 
-	int v11; 
-	int v13; 
-	const byte *v14; 
-	char v15; 
-	int v16; 
-	int spriteIndex; 
-	int v18; 
-	Common::String v19; 
+	int v6;
+	int v7;
+	char v8;
+	int v9;
+	int v10;
+	int v11;
+	int v13;
+	const byte *v14;
+	char v15;
+	int v16;
+	int spriteIndex;
+	int v18;
+	Common::String v19;
 
 	v18 = 0;
 	v6 = 0;
@@ -5237,14 +5237,14 @@ void ObjectsManager::ACTION(const byte *spriteData, const Common::String &a2, in
 }
 
 void ObjectsManager::SPACTION(byte *a1, const Common::String &animationSeq, int a3, int a4, int a5, int a6) {
-	int v6; 
-	char v8; 
-	int v9; 
-	int16 v10; 
-	int v11; 
-	int spriteIndex; 
-	char v14; 
-	Common::String v16; 
+	int v6;
+	char v8;
+	int v9;
+	int16 v10;
+	int v11;
+	int spriteIndex;
+	char v14;
+	Common::String v16;
 
 	v6 = 0;
 	spriteIndex = 0;
@@ -5300,16 +5300,16 @@ void ObjectsManager::SPACTION(byte *a1, const Common::String &animationSeq, int
 }
 
 void ObjectsManager::SPACTION1(byte *a1, const Common::String &a2, int a3, int a4, int a5) {
-	int v5; 
-	int v6; 
-	char v7; 
-	int v8; 
-	int v9; 
-	int v10; 
-	int spriteIndex; 
-	int v13; 
-	int v14; 
-	Common::String v15; 
+	int v5;
+	int v6;
+	char v7;
+	int v8;
+	int v9;
+	int v10;
+	int spriteIndex;
+	int v13;
+	int v14;
+	Common::String v15;
 	int v16;
 
 	v14 = 0;
@@ -5365,8 +5365,8 @@ void ObjectsManager::SPACTION1(byte *a1, const Common::String &a2, int a3, int a
 }
 
 void ObjectsManager::TEST_FORET(int a1, int a2, int a3, int a4, int a5, int a6) {
-	signed int v6; 
-	char v7; 
+	signed int v6;
+	char v7;
 
 	v6 = a1;
 	if (_vm->_globals.ECRAN == a1) {
@@ -5467,13 +5467,13 @@ void ObjectsManager::BLOQUE_ANIMX(int idx, int a2) {
 	_vm->_globals.BL_ANIM[idx].v2 = a2;
 }
 
-void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile, 
+void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
 							   const Common::String &animFile, const Common::String &s4, int v) {
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 
 	v5 = 0;
 	_vm->_dialogsManager._inventFl = false;
@@ -5570,7 +5570,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 	_vm->_globals.iRegul = 0;
 }
 
-void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile, 
+void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
 								const Common::String &animFile, const Common::String &s4, int v) {
 	int mouseButtons;
 	bool breakFlag;
@@ -5665,8 +5665,8 @@ LABEL_70:
 	_vm->_graphicsManager.NOFADE = false;
 	_vm->_eventsManager.changeMouseCursor(4);
 
-	int xCheck = 0; 
-	int yCheck = 0; 
+	int xCheck = 0;
+	int yCheck = 0;
 
 	breakFlag = false;
 	while (!_vm->shouldQuit() && !breakFlag) {
@@ -5696,7 +5696,7 @@ LABEL_70:
 		if (!_vm->_globals.SORTIE) {
 			_vm->_dialogsManager.testDialogOpening();
 			VERIFZONE();
-			if (_vm->_globals.chemin == (int16 *)g_PTRNUL 
+			if (_vm->_globals.chemin == (int16 *)g_PTRNUL
 					|| (GOHOME(), _vm->_globals.chemin == (int16 *)g_PTRNUL)) {
 				if (_vm->_globals.GOACTION == 1)
 					PARADISE();
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 7b00a2db45..10e0265e20 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -73,7 +73,7 @@ public:
 	byte *SL_SPR;
 	byte *SL_SPR2;
 	byte *sprite_ptr;
-	const byte *S_old_spr; 
+	const byte *S_old_spr;
 	bool PERSO_ON;
 	bool SL_FLAG;
 	int SL_MODE;
@@ -112,7 +112,7 @@ public:
 	int OBSSEUL;
 	int NVVERBE;
 	int NVZONE;
-	int S_old_ani; 
+	int S_old_ani;
 	int S_old_ret;
 	int nouveau_x, nouveau_y;
 	int nouveau_sens;
@@ -188,7 +188,7 @@ public:
 	void BTGAUCHE();
 	void PARADISE();
 	void CLEAR_ECRAN();
-	
+
 	/**
 	 * Change the currently active player
 	 * @param oldCharacter		Previously played character
@@ -247,13 +247,13 @@ public:
 	/**
 	 * Game scene control method
 	 */
-	void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile, 
+	void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
 			const Common::String &animFile, const Common::String &s4, int v);
 
 	/**
 	 * Game scene control method
 	 */
-	void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile, 
+	void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
 			const Common::String &animFile, const Common::String &s4, int v);
 };
 
diff --git a/engines/hopkins/saveload.cpp b/engines/hopkins/saveload.cpp
index 5eab0c05bf..a7771cd97d 100644
--- a/engines/hopkins/saveload.cpp
+++ b/engines/hopkins/saveload.cpp
@@ -49,7 +49,7 @@ bool SaveLoadManager::bsave(const Common::String &file, const void *buf, size_t
 		delete f;
 
 		return bytesWritten == n;
-	} else 
+	} else
 		return false;
 }
 
@@ -62,7 +62,7 @@ void SaveLoadManager::initSaves() {
 	Common::String dataFilename = "HISCORE.DAT";
 	byte data[100];
 	Common::fill(&data[0], &data[100], 0);
-	
+
 	SAUVE_FICHIER(dataFilename, data, 100);
 }
 
@@ -195,7 +195,7 @@ Common::Error SaveLoadManager::restore(int slot) {
 	delete saveFile;
 
 	// Unpack the inventory
-	for (int i = 0; i < 35; ++i) 
+	for (int i = 0; i < 35; ++i)
 		_vm->_globals.INVENTAIRE[i] = _vm->_globals.SAUVEGARDE->inventory[i];
 
 	// Set variables from loaded data as necessary
@@ -223,16 +223,16 @@ bool SaveLoadManager::readSavegameHeader(int slot, hopkinsSavegameHeader &header
 
 void SaveLoadManager::createThumbnail(Graphics::Surface *s) {
 	int w = _vm->_graphicsManager.Reel_Reduc(SCREEN_WIDTH, REDUCE_AMOUNT);
-	int h = _vm->_graphicsManager.Reel_Reduc(SCREEN_HEIGHT - 40, REDUCE_AMOUNT); 
+	int h = _vm->_graphicsManager.Reel_Reduc(SCREEN_HEIGHT - 40, REDUCE_AMOUNT);
 
 	Graphics::Surface thumb8;
 	thumb8.create(w, h, Graphics::PixelFormat::createFormatCLUT8());
 
-	_vm->_graphicsManager.Reduc_Ecran(_vm->_graphicsManager.VESA_BUFFER, (byte *)thumb8.pixels, 
+	_vm->_graphicsManager.Reduc_Ecran(_vm->_graphicsManager.VESA_BUFFER, (byte *)thumb8.pixels,
 		_vm->_eventsManager._startPos.x, 20, SCREEN_WIDTH, SCREEN_HEIGHT - 40, 80);
 
 	// Convert the 8-bit pixel to 16 bit surface
-	s->create(w, h, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));	
+	s->create(w, h, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 
 	const byte *srcP = (const byte *)thumb8.pixels;
 	uint16 *destP = (uint16 *)s->pixels;
@@ -294,7 +294,7 @@ void SaveLoadManager::convertThumb16To8(Graphics::Surface *thumb16, Graphics::Su
 			for (int palIndex = 0; palIndex < PALETTE_SIZE; ++palIndex) {
 				byte rCurrent, gCurrent, bCurrent;
 				pixelFormat16.colorToRGB(palette[palIndex], rCurrent, gCurrent, bCurrent);
-				
+
 				int diff = ABS((int)r - (int)rCurrent) + ABS((int)g - (int)gCurrent) + ABS((int)b - (int)bCurrent);
 				if (diff < difference) {
 					difference = diff;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 84ae0443cd..c56637979b 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -215,7 +215,7 @@ LABEL_1141:
 					if (_vm->_globals.SAUVEGARDE->data[svField354] == 1
 							&& _vm->_globals.SAUVEGARDE->cloneHopkins.xp && _vm->_globals.SAUVEGARDE->cloneHopkins.yp
 							&& _vm->_globals.SAUVEGARDE->cloneHopkins.field2 && _vm->_globals.SAUVEGARDE->cloneHopkins.location) {
-						
+
 						_vm->_objectsManager.PERX = _vm->_globals.SAUVEGARDE->cloneHopkins.xp;
 						_vm->_objectsManager.PERY = _vm->_globals.SAUVEGARDE->cloneHopkins.yp;
 						_vm->_objectsManager.PERI = _vm->_globals.SAUVEGARDE->cloneHopkins.field2;
@@ -235,7 +235,7 @@ LABEL_1141:
 						_vm->_objectsManager.PERI = _vm->_globals.SAUVEGARDE->realHopkins.field2;
 					}
 				}
-				if (_vm->_globals.SAUVEGARDE->data[svField356] == 1 
+				if (_vm->_globals.SAUVEGARDE->data[svField356] == 1
 						&& _vm->_globals.SAUVEGARDE->realHopkins.location == _vm->_globals.ECRAN) {
 					_vm->_objectsManager.SPRITE(
 					    _vm->_globals.TETE,
@@ -700,7 +700,7 @@ LABEL_1141:
 			_vm->_graphicsManager.FIN_VISU();
 			_vm->_objectsManager.CLEAR_ECRAN();
 
-			if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) { 
+			if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) {
 				_vm->_graphicsManager.FADE_OUTW();
 			} else {
 				_vm->_soundManager.PLAY_SOUND("SOUND17.WAV");
@@ -729,7 +729,7 @@ LABEL_1141:
 			} while (_vm->_objectsManager.BOBPOSI(3) != 100);
 			_vm->_graphicsManager.FADE_OUTW_LINUX(_vm->_graphicsManager.VESA_BUFFER);
 			_vm->_graphicsManager.FIN_VISU();
-			
+
 			// If uncensored, rip the throat of the hostage
 			if (!_vm->_globals.CENSURE) {
 				_vm->_soundManager.SPECIAL_SOUND = 16;
@@ -2306,7 +2306,7 @@ LABEL_1141:
 	}
 	if (*(a1 + 2) == 'S' && *(a1 + 3) == 'O' && *(a1 + 4) == 'U') {
 		int v60 = (int16)READ_LE_UINT16(a1 + 5);
-		
+
 		Common::String file = Common::String::format("SOUND%d.WAV", v60);
 		_vm->_soundManager.PLAY_SOUND(file);
 		v1 = 1;
@@ -2328,24 +2328,24 @@ int ScriptManager::Control_Goto(const byte *dataP) {
 }
 
 int ScriptManager::Control_If(const byte *dataP, int a2) {
-	int v2; 
-	int v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	const byte *v8; 
-	int v9; 
-	int v10; 
-	int v11; 
-	int v12; 
-	int v14; 
-	int v15; 
-	int v16; 
-	int v17; 
-	int v18; 
-	int v19; 
-	int v20; 
+	int v2;
+	int v3;
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	const byte *v8;
+	int v9;
+	int v10;
+	int v11;
+	int v12;
+	int v14;
+	int v15;
+	int v16;
+	int v17;
+	int v18;
+	int v19;
+	int v20;
 
 	v2 = a2;
 LABEL_2:
@@ -2445,7 +2445,7 @@ LABEL_63:
 }
 
 int ScriptManager::Traduction2(const byte *dataP) {
-	int16 result; 
+	int16 result;
 
 	result = 0;
 	if (*dataP != 'F' || *(dataP + 1) != 'C') {
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 01a977cfe4..209215bba6 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -334,7 +334,7 @@ void SoundManager::WSOUND_OFF() {
 
 	for (int i = 1; i <= 48; ++i)
 		DEL_SAMPLE_SDL(i);
-		
+
 	if (MOD_FLAG) {
 		STOP_MUSIC();
 		DEL_MUSIC();
@@ -450,12 +450,12 @@ void SoundManager::checkMusic() {
 		if (mwavIndex == -1) {
 			Music._currentIndex = 0;
 			mwavIndex = Music._mwavIndexes[Music._currentIndex];
-		}			
+		}
 
 		int volume = MUSICVOL * 255 / 16;
 
 		Mwav[mwavIndex]._audioStream->rewind();
-		_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &Mwav[mwavIndex]._soundHandle, 
+		_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &Mwav[mwavIndex]._soundHandle,
 			Mwav[mwavIndex]._audioStream, -1, volume, 0, DisposeAfterUse::NO);
 	}
 }
@@ -501,9 +501,9 @@ void SoundManager::DEL_MSAMPLE(int mwavIndex) {
 }
 
 bool SoundManager::VOICE_MIX(int voiceId, int voiceMode) {
-	int fileNumber; 
-	int oldMusicVol; 
-	bool breakFlag; 
+	int fileNumber;
+	int oldMusicVol;
+	bool breakFlag;
 	Common::String prefix;
 	Common::String filename;
 	Common::File f;
@@ -553,7 +553,7 @@ bool SoundManager::VOICE_MIX(int voiceId, int voiceMode) {
 	            || voiceId == 632
 	            || voiceId == 645))
 		fileNumber = 684;
-	
+
 	if ((unsigned int)(voiceMode - 1) <= 1) {
 		prefix = "DF";
 	}
@@ -568,7 +568,7 @@ bool SoundManager::VOICE_MIX(int voiceId, int voiceMode) {
 	}
 
 	filename = Common::String::format("%s%d", prefix.c_str(), fileNumber);
-	
+
 	if (!_vm->_fileManager.searchCat(filename + ".WAV", 9)) {
 		if (_vm->_globals.FR == 1)
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, "RES_VFR.RES");
@@ -589,7 +589,7 @@ bool SoundManager::VOICE_MIX(int voiceId, int voiceMode) {
 
 		catPos = _vm->_globals.CAT_POSI;
 		catLen = _vm->_globals.CAT_TAILLE;
-	} else {		
+	} else {
 		_vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, filename + ".WAV");
 		if (!f.exists(_vm->_globals.NFICHIER)) {
 			_vm->_fileManager.constructFilename(_vm->_globals.HOPVOICE, filename + ".APC");
@@ -751,7 +751,7 @@ void SoundManager::SDL_LVOICE(size_t filePosition, size_t entryLength) {
 
 	Swav[20]._active = true;
 }
-	
+
 void SoundManager::PLAY_VOICE_SDL() {
 	if (!Swav[20]._active)
 		error("Bad handle");
@@ -836,12 +836,12 @@ void SoundManager::PLAY_SAMPLE_SDL(int voiceIndex, int wavIndex) {
 	Voice[voiceIndex]._status = 1;
 	Voice[voiceIndex].field14 = 4;
 	Voice[voiceIndex]._wavIndex = wavIndex;
-	
+
 	int volume = (voiceIndex == 2) ? VOICEVOL * 255 / 16 : SOUNDVOL * 255 / 16;
 
 	// Start the voice playing
 	Swav[wavIndex]._audioStream->rewind();
-	_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &Swav[wavIndex]._soundHandle, 
+	_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &Swav[wavIndex]._soundHandle,
 		Swav[wavIndex]._audioStream, -1, volume, 0, DisposeAfterUse::NO);
 }
 
@@ -889,9 +889,9 @@ void SoundManager::updateScummVMSoundSettings() {
 
 Audio::RewindableAudioStream *SoundManager::makeSoundStream(Common::SeekableReadStream *stream) {
 	if (_vm->getPlatform() == Common::kPlatformWindows)
-		return Audio::makeAPCStream(stream, DisposeAfterUse::YES);	
+		return Audio::makeAPCStream(stream, DisposeAfterUse::YES);
 	else
-		return Audio::makeWAVStream(stream, DisposeAfterUse::YES);	
+		return Audio::makeWAVStream(stream, DisposeAfterUse::YES);
 }
 
 // Blatant rip from gob engine. Hi DrMcCoy!
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 206bea89e3..8a151531b2 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -164,7 +164,7 @@ public:
 	void PLAY_SAMPLE(int wavIndex, int voiceMode);
 	void PLAY_SAMPLE2(int idx);
 	void PLAY_WAV(int wavIndex);
-	
+
 	void syncSoundSettings();
 	void updateScummVMSoundSettings();
 	void checkSounds();
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index ed41e34c0f..dbb621c0dd 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -50,19 +50,19 @@ void TalkManager::setParent(HopkinsEngine *vm) {
 }
 
 void TalkManager::PARLER_PERSO(const Common::String &filename) {
-	int v2; 
-	int v3; 
-	int v4; 
+	int v2;
+	int v3;
+	int v4;
 	int v5;
 	int v6;
 	int v7;
-	byte *v8; 
-	byte *v9; 
+	byte *v8;
+	byte *v9;
 	byte *v10;
 	int v11;
 	int v14;
 	int v15;
-	Common::String v16; 
+	Common::String v16;
 
 	v15 = 0;
 	_vm->_fontManager.hideText(5);
@@ -118,7 +118,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
 	ANIM_PERSO_INIT();
 	PLIGNE1 = v2;
 	PLIGNE2 = v2 + 1;
-	PLIGNE3 = v2 + 2;	
+	PLIGNE3 = v2 + 2;
 	PLIGNE4 = v2 + 3;
 	v14 = _vm->_eventsManager._mouseCursorId;
 	_vm->_eventsManager._mouseCursorId = 4;
@@ -153,7 +153,7 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
 
 	_vm->_objectsManager.PERSO_ON = false;
 	_vm->_eventsManager._mouseCursorId = v14;
-	
+
 	_vm->_eventsManager.changeMouseCursor(v14);
 	_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
 
@@ -237,7 +237,7 @@ void TalkManager::PARLER_PERSO2(const Common::String &filename) {
 	int v8 = _vm->_eventsManager._mouseCursorId;
 	_vm->_eventsManager._mouseCursorId = 4;
 	_vm->_eventsManager.changeMouseCursor(0);
-  
+
 	if (!_vm->_globals.NOPARLE) {
 		int v2 = v1 + 3;
 		int v3;
@@ -274,7 +274,7 @@ void TalkManager::RENVOIE_FICHIER(int srcStart, Common::String &dest, const char
 }
 
 int TalkManager::DIALOGUE() {
-	byte *v0; 
+	byte *v0;
 	int v1;
 	int v2;
 	int v3;
@@ -285,13 +285,13 @@ int TalkManager::DIALOGUE() {
 	int v8;
 	int v9;
 	int v10;
-	byte *v11; 
+	byte *v11;
 	int v12;
 	int v13;
 	int v14;
 	int v15;
 	int v16;
-	int v18; 
+	int v18;
 	int v19;
 	int v20;
 	int v21;
@@ -312,7 +312,7 @@ int TalkManager::DIALOGUE() {
 	} else {
 		VISU_WAIT();
 	}
-	
+
 	v19 = VERIF_BOITE(PLIGNE1, FQUEST, 65);
 	v2 = VERIF_BOITE(PLIGNE2, FQUEST, 65);
 	v3 = VERIF_BOITE(PLIGNE3, FQUEST, 65);
@@ -355,20 +355,20 @@ int TalkManager::DIALOGUE() {
 			_vm->_fontManager.setOptimalColor(5, 6, 7, 8);
 			v5 = PLIGNE4;
 		}
-    
+
 		_vm->_eventsManager.VBL();
 		if (_vm->_eventsManager.getMouseButton())
 			v6 = 1;
 		if (v5 == -1)
 			v6 = 0;
 	} while (!_vm->shouldQuit() && v6 != 1);
-  
+
 	_vm->_soundManager.VOICE_MIX(v5, 1);
 	_vm->_fontManager.hideText(5);
 	_vm->_fontManager.hideText(6);
 	_vm->_fontManager.hideText(7);
 	_vm->_fontManager.hideText(8);
-  
+
 	if (STATI) {
 		v11 = BUFFERPERSO;
 		v12 = (int16)READ_LE_UINT16((uint16 *)BUFFERPERSO + 48);
@@ -389,7 +389,7 @@ int TalkManager::DIALOGUE() {
 	} else {
 		FIN_VISU_WAIT();
 	}
-  
+
 	_vm->_eventsManager.VBL();
   return v5;
 }
@@ -398,28 +398,28 @@ int TalkManager::DIALOGUE_REP(int idx) {
 	int v1;
 	int v2;
 	byte *v3;
-	int i; 
+	int i;
 	int v6;
 	int v7;
 	byte *v8;
-	int v9; 
+	int v9;
 	int v10;
 	int v11;
 	int v12;
 	int v13;
 	int v14;
 	void *v15;
-	int v16; 
-	int v17; 
-	int v18; 
-	int v19; 
-	int v20; 
-	int v21; 
-	int v22; 
-	int v23; 
-	int v24; 
-	int v25; 
-	
+	int v16;
+	int v17;
+	int v18;
+	int v19;
+	int v20;
+	int v21;
+	int v22;
+	int v23;
+	int v24;
+	int v25;
+
 	v1 = 0;
 	v2 = 0;
 	v3 = BUFFERPERSO + 110;
@@ -444,7 +444,7 @@ int TalkManager::DIALOGUE_REP(int idx) {
 	PLIGNE3 = (int16)READ_LE_UINT16((uint16 *)v3 + 7);
 	v6 = (int16)READ_LE_UINT16((uint16 *)v3 + 8);
 	v7 = (int16)READ_LE_UINT16((uint16 *)v3 + 9);
-  
+
 	if (v7)
 		_vm->_globals.SAUVEGARDE->data[svField4] = v7;
 
@@ -535,16 +535,16 @@ int TalkManager::DIALOGUE_REP(int idx) {
 
 void TalkManager::CHERCHE_PAL(int a1, int a2) {
 	int v2;
-	size_t v4; 
+	size_t v4;
 	unsigned int v5;
-	byte *palette; 
-	int v8; 
+	byte *palette;
+	int v8;
 
 	v2 = 0;
 	v8 = 0;
 	v4 = a1;
 	for (;;) {
-		if ( *(BUFFERPERSO + v4) == 'P' 
+		if ( *(BUFFERPERSO + v4) == 'P'
 				&& *(BUFFERPERSO + v4 + 1) == 'A'
 				&& *(BUFFERPERSO + v4 + 2) == 'L') {
 			v8 = 1;
@@ -556,7 +556,7 @@ void TalkManager::CHERCHE_PAL(int a1, int a2) {
 		if (TAILLEPERSO == v4)
 			return;
 	}
-  
+
 	v5 = v2 + 5;
 	palette = BUFFERPERSO + v5;
 	PALPERSO = BUFFERPERSO + v5;
@@ -588,7 +588,7 @@ void TalkManager::CHERCHE_PAL(int a1, int a2) {
 		*(palette + 763) = 0;
 		*(palette + 764) = 0;
 	}
-  
+
 	_vm->_graphicsManager.setpal_vga256(palette);
 	_vm->_graphicsManager.INIT_TABLE(145, 150, palette);
 }
@@ -617,10 +617,10 @@ void TalkManager::FIN_VISU_PARLE() {
 		if (_vm->_globals.Bqe_Anim[idx].field4 == 1)
 			_vm->_objectsManager.BOB_OFF(idx);
 	}
-  
+
 	_vm->_eventsManager.VBL();
 	_vm->_eventsManager.VBL();
-	
+
 	for (int idx = 21; idx <= 25; ++idx) {
 		if (_vm->_globals.Bqe_Anim[idx].field4 == 1)
 			_vm->_objectsManager.BOB_ZERO(idx);
@@ -630,17 +630,17 @@ void TalkManager::FIN_VISU_PARLE() {
 int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
 	int v6;
 	int v7;
-	char v8; 
+	char v8;
 	int v9;
 	int v10;
-	char v11; 
-	char v13; 
-	char v14; 
+	char v11;
+	char v13;
+	char v14;
 	int v15;
-	byte *ptr; 
+	byte *ptr;
 	int v17;
 	int v18;
-	byte *v19; 
+	byte *v19;
 	uint32 indexData[4047];
 	Common::String filename;
 	Common::String dest;
@@ -650,7 +650,7 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
 	v18 = 0;
 	_vm->_globals.police_l = 11;
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, file);
-	
+
 	// Build up the filename
 	filename = dest = _vm->_globals.NFICHIER;
 	while (filename.lastChar() != '.')
@@ -660,7 +660,7 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
 	if (!f.open(filename))
 		error("Could not open file - %s", filename.c_str());
 	filesize = f.size();
-	assert(filesize < 16188);	
+	assert(filesize < 16188);
 
 	for (int i = 0; i < (filesize / 4); ++i)
 		indexData[i] = f.readUint32LE();
@@ -694,7 +694,7 @@ int TalkManager::VERIF_BOITE(int idx, const Common::String &file, int a3) {
 		v19 = v19 + 1;
 		++v6;
 	} while ((unsigned int)v6 < 0x800);
-  
+
 	v7 = 0;
 	do {
 		v8 = *(ptr + v7);
@@ -772,13 +772,13 @@ void TalkManager::BOB_VISU_PARLE(int idx) {
 
 void TalkManager::CHERCHE_ANIM0(int a1, int a2) {
 	size_t v2;
-	int v3; 
+	int v3;
 	size_t v4;
 	unsigned int v5;
 	unsigned int v6;
 	int v7;
-	byte *v8; 
-	byte *v9; 
+	byte *v8;
+	byte *v9;
 
 	v2 = 0;
 	v3 = 0;
@@ -816,14 +816,14 @@ void TalkManager::CHERCHE_ANIM0(int a1, int a2) {
 
 void TalkManager::ANIM_PERSO_INIT() {
 	byte *v0;
-	byte *v1; 
+	byte *v1;
 	int v2;
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
 	int v10;
 	int v11;
 	int v12;
@@ -870,26 +870,26 @@ void TalkManager::clearCharacterAnim() {
 }
 
 bool TalkManager::searchCharacterAnim(int a1, const byte *bufPerso, int a3, int a4) {
-	bool result; 
-	const byte *v5; 
-	int v6; 
+	bool result;
+	const byte *v5;
+	int v6;
 	int v7;
-	byte *v8; 
-	byte *v9; 
+	byte *v8;
+	byte *v9;
 	int v10;
 	int v11;
 	int v12;
-	char v13; 
+	char v13;
 	int v14;
 	int v15;
 	int v16;
-	char v17; 
-	int v18; 
+	char v17;
+	int v18;
 	int v19;
-	int v20; 
-	int v22; 
+	int v20;
+	int v22;
 	int v23;
-	const byte *v24; 
+	const byte *v24;
 
 	v22 = 0;
 	result = false;
@@ -964,22 +964,22 @@ bool TalkManager::searchCharacterAnim(int a1, const byte *bufPerso, int a3, int
 }
 
 void TalkManager::REPONSE(int a1, int a2) {
-	byte v2; 
-	byte v3; 
-	byte *v5; 
-	byte *v6; 
-	uint16 v7; 
-	byte *v8; 
-	int v9; 
-	int v10; 
-	uint16 v11; 
-	int v12; 
-	int v13; 
-	int v14; 
-	int v15; 
-	int v16; 
-	int v17; 
-	byte *ptr; 
+	byte v2;
+	byte v3;
+	byte *v5;
+	byte *v6;
+	uint16 v7;
+	byte *v8;
+	int v9;
+	int v10;
+	uint16 v11;
+	int v12;
+	int v13;
+	int v14;
+	int v15;
+	int v16;
+	int v17;
+	byte *ptr;
 
 	v2 = a1;
 	v3 = a2;
@@ -1073,15 +1073,15 @@ LABEL_2:
 }
 
 void TalkManager::REPONSE2(int a1, int a2) {
-	signed int v3; 
-	int v4; 
-	int v5; 
-	int v6; 
-	int v7; 
-	int v8; 
-	int v9; 
-	int v10; 
-	int v11; 
+	signed int v3;
+	int v4;
+	int v5;
+	int v6;
+	int v7;
+	int v8;
+	int v9;
+	int v10;
+	int v11;
 
 	v3 = 0;
 	if (a2 == 5 && _vm->_globals.SAUVEGARDE->data[svField3] == 4) {
@@ -1185,22 +1185,22 @@ void TalkManager::REPONSE2(int a1, int a2) {
 }
 
 void TalkManager::OBJET_VIVANT(const Common::String &a2) {
-	int v2; 
-	const char *v4; 
-	int v5; 
+	int v2;
+	const char *v4;
+	int v5;
 	bool v6;
-	int v10; 
-	byte *v11; 
-	int v12; 
-	int v13; 
-	byte *v14; 
-	byte *v15; 
-	byte *v16; 
-	int v17; 
+	int v10;
+	byte *v11;
+	int v12;
+	int v13;
+	byte *v14;
+	byte *v15;
+	byte *v16;
+	int v17;
 	Common::String s;
-	Common::String v20; 
-	Common::String v22; 
-	Common::String v23; 
+	Common::String v20;
+	Common::String v22;
+	Common::String v23;
 
 	_vm->_fontManager.hideText(5);
 	_vm->_fontManager.hideText(9);
-- 
cgit v1.2.3