Whitespace cleanup: Convert space followed by tab to just tab

svn-id: r39203

62 files changed, 261 insertions, 261 deletions

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index f503730b53..ebb4a66ae6 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -357,7 +357,7 @@ protected:
 	HitArea *_lastHitArea3;
 	Item *_hitAreaSubjectItem;
 	HitArea *_currentBox, *_currentVerbBox, *_lastVerbOn;
-	uint16 	_currentBoxNum;
+	uint16	_currentBoxNum;
 	uint16 _needHitAreaRecalc;
 	uint16 _verbHitArea;
 	uint16 _defaultVerb;
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index 5d33056f60..3c71e539ef 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -747,7 +747,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
 		if (!(best_ha->flags & kBFBoxSelected)) {
 			hitarea_leave(best_ha, false);
 			best_ha->flags |= kBFBoxSelected;
- 		}
+		}
 	} else {
 		if (mode == 0)
 			return;
@@ -762,7 +762,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
 			hitarea_leave(best_ha, false);
 			best_ha->flags |= kBFBoxSelected;
 		}
- 	}
+	}
 }
 
 void AGOSEngine_Waxworks::boxController(uint x, uint y, uint mode) {
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index c9a5ecaa19..700d0263f4 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -974,8 +974,8 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesNone,
 		"intro"
 	},
- 	{ // Supplied by kizkoool in bugreport #2089734
- 		{
+	{ // Supplied by kizkoool in bugreport #2089734
+		{
 			"bargon",
 			"",
 			AD_ENTRY1s("intro.stk", "00f6b4e2ee26e5c40b488e2df5adcf03", 3975580),
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 23daba0524..08ee4815cc 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -1082,7 +1082,7 @@ bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSupportsListSaves) ||
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave) ||
-	   	(f == kSavesSupportMetaInfo) ||
+	  	(f == kSavesSupportMetaInfo) ||
 		(f == kSavesSupportThumbnail);
 }
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 3abe72ea60..c7591a3e1c 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -652,7 +652,7 @@ uint16 LoLEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
 }
 
 uint16 LoLEngine::calcBlockIndex(uint16 x, uint16 y) {
- 	return ((y & 0xff00) >> 3) | (x >> 8);
+	return ((y & 0xff00) >> 3) | (x >> 8);
 }
 
 void LoLEngine::calcCoordinates(uint16 & x, uint16 & y, int block, uint16 xOffs, uint16 yOffs) {
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 712a3b16f8..c85c5b3ef0 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -2553,7 +2553,7 @@ bool TownsPC98_OpnChannelPCM::control_ff_endOfTrack(uint8 para) {
 	}
 }
 
-TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerbase) : 	_tlTable(0),
+TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerbase) :	_tlTable(0),
 	_tleTable(0), _updateRequest(-1), _tickLength(timerbase * 27), _ready(0), _reg(0), _rand(1), _outN(1),
 	_nTick(0), _evpUpdateCnt(0), _evpTimer(0x1f), _pReslt(0x1f), _attack(0), _cont(false), _evpUpdate(true),
 	_timer(0), _noiseGenerator(0), _chanEnable(0) {
diff --git a/engines/m4/burger_data.h b/engines/m4/burger_data.h
index 000d0a9654..c053268705 100644
--- a/engines/m4/burger_data.h
+++ b/engines/m4/burger_data.h
@@ -32,7 +32,7 @@
 namespace M4 {
 
 InventoryObject burger_inventory [] = {
-	// name 					scene	icon
+	// name					scene	icon
 	//--------------------		-----	-----
 	{ "empty jug",				303,	14 },
 	{ "distilled juice",		999,	15 },
@@ -41,7 +41,7 @@ InventoryObject burger_inventory [] = {
 	{ "broken mouse trap",		999,	18 },
 	{ "mouse trap",				999,	19 },
 	{ "kindling",				999,	20 },
-	{ "burning kindling", 		999,	21 },
+	{ "burning kindling",		999,	21 },
 	{ "lights",					508,	22 },
 	{ "lights on",				508,	23 },
 	{ "bottle",					999,	24 },
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index ec32c29fda..aaf05fb94f 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -79,12 +79,12 @@ enum WoodScriptGlobals {
 	kGlobTemp32		= 38
 };
 
-const uint32 SERIES_FORWARD 				=  0;
-const uint32 SERIES_PINGPONG	 			=  1;
-const uint32 SERIES_BACKWARD 				=  2;
-const uint32 SERIES_RANDOM 					=  4;
-const uint32 SERIES_NO_TOSS 				=  8;
-const uint32 SERIES_STICK		 			= 16;
+const uint32 SERIES_FORWARD				=  0;
+const uint32 SERIES_PINGPONG				=  1;
+const uint32 SERIES_BACKWARD				=  2;
+const uint32 SERIES_RANDOM					=  4;
+const uint32 SERIES_NO_TOSS				=  8;
+const uint32 SERIES_STICK					= 16;
 const uint32 SERIES_LOOP_TRIGGER			= 32;
 const uint32 SERIES_LOAD_PALETTE			= 64;
 const uint32 SERIES_HORZ_FLIP				=128;
diff --git a/engines/m4/script.cpp b/engines/m4/script.cpp
index 439c111ce9..243f073403 100644
--- a/engines/m4/script.cpp
+++ b/engines/m4/script.cpp
@@ -556,7 +556,7 @@ void ScriptInterpreter::callKernelFunction(uint32 index) {
 
 	int args = (this->*(_kernelFunctions[index].proc))();
 	// Now remove values from the stack if the function used any
- 	if (args > 4)
+	if (args > 4)
 		_stackPtr -= args - 4;
 
 	printf("-------------\n");
diff --git a/engines/m4/ws_machine.cpp b/engines/m4/ws_machine.cpp
index 0410f29f5b..985ceedb2e 100644
--- a/engines/m4/ws_machine.cpp
+++ b/engines/m4/ws_machine.cpp
@@ -34,16 +34,16 @@ bool (Machine::*machineCommandsTable[])(Instruction &instruction) = {
 	&Machine::m1_jump,
 	&Machine::m1_terminate,
 	&Machine::m1_startSequence,
- 	&Machine::m1_pauseSequence,
- 	&Machine::m1_resumeSequence,
- 	&Machine::m1_storeValue,
- 	&Machine::m1_sendMessage,
- 	&Machine::m1_broadcastMessage,
- 	&Machine::m1_replyMessage,
- 	&Machine::m1_sendSystemMessage,
- 	&Machine::m1_createMachine,
- 	&Machine::m1_createMachineEx,
- 	&Machine::m1_clearVars
+	&Machine::m1_pauseSequence,
+	&Machine::m1_resumeSequence,
+	&Machine::m1_storeValue,
+	&Machine::m1_sendMessage,
+	&Machine::m1_broadcastMessage,
+	&Machine::m1_replyMessage,
+	&Machine::m1_sendSystemMessage,
+	&Machine::m1_createMachine,
+	&Machine::m1_createMachineEx,
+	&Machine::m1_clearVars
 };
 
 void (Machine::*machineConditionalsTable[])(Instruction &instruction) = {
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index 773b74e36d..a5b30aa041 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -275,7 +275,7 @@ static const MadeGameDescription gameDescriptions[] = {
 		0,
 		GF_FLOPPY,
 		1,
- 	},
+	},
 
 	{
 		// Leather Goddesses of Phobos 2
diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp
index 1ce416c9f1..f71f5f756f 100644
--- a/engines/made/redreader.cpp
+++ b/engines/made/redreader.cpp
@@ -366,7 +366,7 @@ void LzhDecompressor::downheap(int i) {
 	k = heap[i];
 	while ((j = 2 * i) <= heapsize) {
 		if (j < heapsize && freq[heap[j]] > freq[heap[j + 1]])
-		 	j++;
+			j++;
 		if (freq[k] <= freq[heap[j]]) break;
 		heap[i] = heap[j];  i = j;
 	}
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index 91ceb02b89..82864f1daf 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -161,7 +161,7 @@ void ScreenEffects::flash(int flashCount, byte *palette, int colorCount) {
 		_screen->setRGBPalette(_fxPalette, 0, colorCount);
 		_screen->updateScreenAndWait(20);
 		_screen->setRGBPalette(palette, 0, colorCount);
-  		_screen->updateScreenAndWait(20);
+ 		_screen->updateScreenAndWait(20);
 	}
 }
 
@@ -309,7 +309,7 @@ void ScreenEffects::vfx01(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, x, 312);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx02(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -318,7 +318,7 @@ void ScreenEffects::vfx02(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, 312 - x, 312);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx03(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -327,7 +327,7 @@ void ScreenEffects::vfx03(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, y, 190);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx04(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -336,7 +336,7 @@ void ScreenEffects::vfx04(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, 190 - y, 190);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx05(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -346,7 +346,7 @@ void ScreenEffects::vfx05(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, y, 90);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx06(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -356,7 +356,7 @@ void ScreenEffects::vfx06(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, x, 152);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx07(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -366,7 +366,7 @@ void ScreenEffects::vfx07(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, 152 - x, 152);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 // "Screen slide in" right to left
@@ -443,7 +443,7 @@ void ScreenEffects::vfx14(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, i, 27);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx15(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -454,7 +454,7 @@ void ScreenEffects::vfx15(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, i, 27);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 void ScreenEffects::vfx16(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) {
@@ -465,7 +465,7 @@ void ScreenEffects::vfx16(Graphics::Surface *surface, byte *palette, byte *newPa
 		setBlendedPalette(palette, newPalette, colorCount, i, 27);
 		_screen->updateScreenAndWait(25);
 	}
- 	setPalette(palette);
+	setPalette(palette);
 }
 
 // Palette fadeout/fadein
diff --git a/engines/made/script.cpp b/engines/made/script.cpp
index c25a807f61..3c3142a6ed 100644
--- a/engines/made/script.cpp
+++ b/engines/made/script.cpp
@@ -585,9 +585,9 @@ void ScriptInterpreter::cmd_send() {
 	_stack.push(_codeIp - _codeBase);
 	_stack.push(_runningScriptObjectIndex);
 	_stack.push(kScriptStackLimit - _localStackPos);
- 	_localStackPos = _stack.getStackPos();
+	_localStackPos = _stack.getStackPos();
 
- 	int16 propertyId = _stack.peek(_localStackPos + argc + 2);
+	int16 propertyId = _stack.peek(_localStackPos + argc + 2);
 	int16 objectIndex = _stack.peek(_localStackPos + argc + 4);
 
 	debug(4, "objectIndex = %d (%04X); propertyId = %d(%04X)", objectIndex, objectIndex, propertyId, propertyId);
@@ -708,25 +708,25 @@ void ScriptInterpreter::dumpScript(int16 objectIndex, int *opcodeStats, int *ext
 				switch (*sig) {
 				case 'b':
 					valueType = 0;
-	 				value = *code++;
+					value = *code++;
 					break;
 				case 'B':
-	 				valueType = 1;
-	 				value = *code++;
+					valueType = 1;
+					value = *code++;
 					break;
 				case 'w':
 					valueType = 0;
-	 				value = READ_LE_UINT16(code);
-	 				code += 2;
+					value = READ_LE_UINT16(code);
+					code += 2;
 					break;
 				case 'W':
-	 				valueType = 1;
-	 				value = READ_LE_UINT16(code);
-	 				code += 2;
+					valueType = 1;
+					value = READ_LE_UINT16(code);
+					code += 2;
 					break;
 				case 'E':
-	 				valueType = 2;
-	 				value = *code++;
+					valueType = 2;
+					value = *code++;
 					break;
 				}
 				switch (valueType) {
@@ -742,7 +742,7 @@ void ScriptInterpreter::dumpScript(int16 objectIndex, int *opcodeStats, int *ext
 						externStats[value]++;
 					} else {
 						snprintf(tempStr, 32, "invalid: %d", value);
-	 				}
+					}
 					break;
 				}
 				codeLine += tempStr;
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index 7a07550b6f..77e180628f 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -190,7 +190,7 @@ int16 ScriptFunctions::sfClearScreen(int16 argc, int16 *argv) {
 		_vm->_mixer->stopHandle(_audioStreamHandle);
 		_vm->_autoStopSound = false;
 	}
- 	_vm->_screen->clearScreen();
+	_vm->_screen->clearScreen();
 	return 0;
 }
 
diff --git a/engines/made/sound.cpp b/engines/made/sound.cpp
index 5af514d3bc..99186fc008 100644
--- a/engines/made/sound.cpp
+++ b/engines/made/sound.cpp
@@ -42,11 +42,11 @@ void ManholeEgaSoundDecompressor::decompress(byte *source, byte *dest, uint32 si
 	_writeFlag = false;
 	_eof = false;
 	_sample1 = 0x80000;
- 	_sample2 = 0x800000;
- 	_sample3 = 0x800000;
- 	_sample4 = 0x800000;
- 	_mode = getBit();
- 	while (!_eof) {
+	_sample2 = 0x800000;
+	_sample3 = 0x800000;
+	_sample4 = 0x800000;
+	_mode = getBit();
+	while (!_eof) {
 		update1();
 		update3();
 		update0();
@@ -233,7 +233,7 @@ void decompressSound(byte *source, byte *dest, uint16 chunkSize, uint16 chunkCou
 			break;
 
 		default:
-	  		return;
+	 		return;
 
 		}
 
diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index ab3b9deca7..ac1e8c37e5 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -45,7 +45,7 @@ Debugger::Debugger(Parallaction *vm)
 	DCmd_Register("localflags",	WRAP_METHOD(Debugger, Cmd_LocalFlags));
 	DCmd_Register("locations",	WRAP_METHOD(Debugger, Cmd_Locations));
 	DCmd_Register("gfxobjects",	WRAP_METHOD(Debugger, Cmd_GfxObjects));
-	DCmd_Register("programs", 	WRAP_METHOD(Debugger, Cmd_Programs));
+	DCmd_Register("programs",	WRAP_METHOD(Debugger, Cmd_Programs));
 
 }
 
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 6d78dc1a57..4cc3fb4fe1 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -72,7 +72,7 @@ class NSArchive : public Common::Archive {
 	uint32			_archiveOffsets[MAX_ARCHIVE_ENTRIES];
 	uint32			_numFiles;
 
-	uint32 			lookup(const char *name) const;
+	uint32			lookup(const char *name) const;
 
 public:
 	NSArchive(Common::SeekableReadStream *stream, Common::Platform platform, uint32 features);
@@ -90,27 +90,27 @@ NSArchive::NSArchive(Common::SeekableReadStream *stream, Common::Platform platfo
 		error("NSArchive: invalid stream passed to constructor");
 	}
 
- 	bool isSmallArchive = false;
+	bool isSmallArchive = false;
 	if (platform == Common::kPlatformAmiga) {
 		if (features & GF_DEMO) {
- 			isSmallArchive = stream->size() == SIZEOF_SMALL_ARCHIVE;
+			isSmallArchive = stream->size() == SIZEOF_SMALL_ARCHIVE;
 		} else if (features & GF_LANG_MULT) {
- 			isSmallArchive = (stream->readUint32BE() != MKID_BE('NDOS'));
- 		}
- 	}
+			isSmallArchive = (stream->readUint32BE() != MKID_BE('NDOS'));
+		}
+	}
 
- 	_numFiles = (isSmallArchive) ? SMALL_ARCHIVE_FILES_NUM : NORMAL_ARCHIVE_FILES_NUM;
+	_numFiles = (isSmallArchive) ? SMALL_ARCHIVE_FILES_NUM : NORMAL_ARCHIVE_FILES_NUM;
 
 	_stream->seek(ARCHIVE_FILENAMES_OFS);
 	_stream->read(_archiveDir, _numFiles*32);
 
 	_stream->seek((isSmallArchive) ? SMALL_ARCHIVE_SIZES_OFS : NORMAL_ARCHIVE_SIZES_OFS);
 
- 	uint32 dataOffset = (isSmallArchive) ? SMALL_ARCHIVE_DATA_OFS : NORMAL_ARCHIVE_DATA_OFS;
- 	for (uint16 i = 0; i < _numFiles; i++) {
- 		_archiveOffsets[i] = dataOffset;
+	uint32 dataOffset = (isSmallArchive) ? SMALL_ARCHIVE_DATA_OFS : NORMAL_ARCHIVE_DATA_OFS;
+	for (uint16 i = 0; i < _numFiles; i++) {
+		_archiveOffsets[i] = dataOffset;
 		_archiveLenghts[i] = _stream->readUint32BE();
- 		dataOffset += _archiveLenghts[i];
+		dataOffset += _archiveLenghts[i];
 	}
 
 }
@@ -121,9 +121,9 @@ NSArchive::~NSArchive() {
 
 uint32 NSArchive::lookup(const char *name) const {
 	uint32 i = 0;
- 	for ( ; i < _numFiles; i++) {
+	for ( ; i < _numFiles; i++) {
 		if (!scumm_stricmp(_archiveDir[i], name)) break;
- 	}
+	}
 	return i;
 }
 
diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
index 0bc40de11b..cc816b9b5a 100644
--- a/engines/parallaction/exec.h
+++ b/engines/parallaction/exec.h
@@ -238,7 +238,7 @@ protected:
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(call);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on);
- 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
+	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(dec);
 	DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set);
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 007590705c..2816729eb6 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -131,7 +131,7 @@ struct Cnv : public Frames {
 	uint16	_height;	//
 	byte**	field_8;	// unused
 	byte*	_data;
-	bool 	_freeData;
+	bool	_freeData;
 
 public:
 	Cnv() {
@@ -343,12 +343,12 @@ public:
 struct BackgroundInfo {
 protected:
 	typedef Common::Array<MaskBuffer*> MaskPatches;
-	MaskPatches 	_maskPatches;
+	MaskPatches	_maskPatches;
 	MaskBuffer		_maskBackup;
 	void clearMaskData();
 
 	typedef Common::Array<PathBuffer*> PathPatches;
-	PathPatches 	_pathPatches;
+	PathPatches	_pathPatches;
 	PathBuffer		_pathBackup;
 	void clearPathData();
 
@@ -363,7 +363,7 @@ public:
 
 	Palette				palette;
 
-	int 				layers[4];
+	int				layers[4];
 	PaletteFxRange		ranges[6];
 
 
@@ -505,12 +505,12 @@ protected:
 
 	Graphics::Surface	*lockScreen();
 	void				unlockScreen();
-	void 				updateScreenIntern();
+	void				updateScreenIntern();
 
 	bool				_doubleBuffering;
 	int					_gameType;
 	Graphics::Surface	_backBuffer;
-	void 				copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
+	void				copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 
 	int					_scrollPos;
 	int					_minScroll, _maxScroll;
@@ -526,7 +526,7 @@ protected:
 	// overlay mode enables drawing of graphics with automatic screen-to-game coordinate translation
 	bool				_overlayMode;
 	void				drawOverlay(Graphics::Surface &surf);
-	void 				drawInventory();
+	void				drawInventory();
 
 	void drawList(Graphics::Surface &surface, GfxObjArray &list);
 	void updateFloatingLabel();
diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp
index 57fd4b6c39..dd46e04317 100644
--- a/engines/parallaction/gui_ns.cpp
+++ b/engines/parallaction/gui_ns.cpp
@@ -397,7 +397,7 @@ class SelectCharacterInputState_NS : public MenuInputState {
 	}
 
 	byte	_points[3];
-	bool 	_fail;
+	bool	_fail;
 	const uint16 (*_keys)[PASSWORD_LEN];
 	Graphics::Surface _block;
 	Graphics::Surface _emptySlots;
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 512569590a..e1efe01fab 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -304,9 +304,9 @@ bool Input::translateGameInput() {
 	}
 
 	trackMouse(z);
- 	if (!z) {
- 		return true;
- 	}
+	if (!z) {
+		return true;
+	}
 
 	if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) {
 
diff --git a/engines/parallaction/input.h b/engines/parallaction/input.h
index e26f4d71fd..cf2c4306de 100644
--- a/engines/parallaction/input.h
+++ b/engines/parallaction/input.h
@@ -48,7 +48,7 @@ enum MouseTriState {
 };
 
 class Input {
-	int 		updateGameInput();
+	int		updateGameInput();
 
 	bool		_hasKeyPressEvent;
 	Common::KeyState _keyPressed;
@@ -61,8 +61,8 @@ class Input {
 	void		translateInput();
 	bool		translateGameInput();
 	bool		updateInventoryInput();
-	void 		takeAction(ZonePtr z);
-	void 		walkTo(const Common::Point &dest);
+	void		takeAction(ZonePtr z);
+	void		walkTo(const Common::Point &dest);
 
 	Parallaction	*_vm;
 
@@ -72,7 +72,7 @@ class Input {
 	ZonePtr			_hoverZone;
 
 	void	enterInventoryMode();
-	void 	exitInventoryMode();
+	void	exitInventoryMode();
 
 	int		_gameType;
 
@@ -112,11 +112,11 @@ public:
 	InventoryItem	_activeItem;
 
 	void	readInput();
-	int 	updateInput();
+	int	updateInput();
 	void	trackMouse(ZonePtr z);
 	void	waitForButtonEvent(uint32 buttonEventMask, int32 timeout = -1);
 	uint32	getLastButtonEvent() { return _mouseButtons; }
-	bool  	getLastKeyDown(uint16 &ascii);
+	bool 	getLastKeyDown(uint16 &ascii);
 
 	void stopHovering();
 
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index 8d9daec0af..6b1579fa8d 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -62,24 +62,24 @@ InventoryItem _verbs_BR[] = {
 };
 
 InventoryProperties	_invProps_NS = {
-	32, 		// INVENTORYITEM_PITCH
-	24, 		// INVENTORYITEM_WIDTH
-	24, 		// INVENTORYITEM_HEIGHT
-	30, 		// INVENTORY_MAX_ITEMS
-	5, 			// INVENTORY_ITEMS_PER_LINE
-	6, 			// INVENTORY_LINES
-	5 * 24, 	// INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
+	32,		// INVENTORYITEM_PITCH
+	24,		// INVENTORYITEM_WIDTH
+	24,		// INVENTORYITEM_HEIGHT
+	30,		// INVENTORY_MAX_ITEMS
+	5,			// INVENTORY_ITEMS_PER_LINE
+	6,			// INVENTORY_LINES
+	5 * 24,	// INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
 	6 * 24		// INVENTORY_HEIGHT = (INVENTORY_LINES*INVENTORYITEM_HEIGHT)
 };
 
 InventoryProperties	_invProps_BR = {
-	51, 		// INVENTORYITEM_PITCH
-	51, 		// INVENTORYITEM_WIDTH
-	51, 		// INVENTORYITEM_HEIGHT
-	48, 		// INVENTORY_MAX_ITEMS
-	6, 			// INVENTORY_ITEMS_PER_LINE
-	8, 			// INVENTORY_LINES
-	6 * 51, 		// INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
+	51,		// INVENTORYITEM_PITCH
+	51,		// INVENTORYITEM_WIDTH
+	51,		// INVENTORYITEM_HEIGHT
+	48,		// INVENTORY_MAX_ITEMS
+	6,			// INVENTORY_ITEMS_PER_LINE
+	8,			// INVENTORY_LINES
+	6 * 51,		// INVENTORY_WIDTH =(INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
 	8 * 51			// INVENTORY_HEIGHT = (INVENTORY_LINES*INVENTORYITEM_HEIGHT)
 };
 
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 60c854661e..37ebc54659 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -346,10 +346,10 @@ public:
 
 
 	// getters/setters
-	virtual int16 getX() 			{ return _left; }
+	virtual int16 getX()			{ return _left; }
 	virtual void  setX(int16 value) { _left = value; }
 
-	virtual int16 getY() 			{ return _top; }
+	virtual int16 getY()			{ return _top; }
 	virtual void  setY(int16 value) { _top = value; }
 };
 
@@ -533,16 +533,16 @@ public:
 	void forceXYZF(int16 x, int16 y, int16 z, int16 f);
 
 	// getters/setters used by scripts
-	int16 getX() 			{ return _left; }
+	int16 getX()			{ return _left; }
 	void  setX(int16 value) { _left = value; }
 
-	int16 getY() 			{ return _top; }
+	int16 getY()			{ return _top; }
 	void  setY(int16 value) { _top = value; }
 
-	int16 getZ() 			{ return _z; }
+	int16 getZ()			{ return _z; }
 	void  setZ(int16 value) { _z = value; }
 
-	int16 getF() 			{ return _frame; }
+	int16 getF()			{ return _frame; }
 	void  setF(int16 value);
 
 	void getFoot(Common::Point &foot);
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 646af212ae..9bfd633a8b 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -293,10 +293,10 @@ public:
 	Table				*_localFlagNames;
 	CommandExec			*_cmdExec;
 	ProgramExec			*_programExec;
-	Inventory 			*_inventory;
-	BalloonManager 		*_balloonMan;
+	Inventory			*_inventory;
+	BalloonManager		*_balloonMan;
 	DialogueManager		*_dialogueMan;
-	InventoryRenderer 	*_inventoryRenderer;
+	InventoryRenderer	*_inventoryRenderer;
 
 	// game data
 	Character		_char;
@@ -313,31 +313,31 @@ public:
 
 protected:
 	void	runGame();
-	void 	runGameFrame(int event);
-	void 	runGuiFrame();
-	void 	cleanupGui();
-	void 	runDialogueFrame();
-	void 	exitDialogueMode();
-	void 	runCommentFrame();
-	void 	enterCommentMode(ZonePtr z);
-	void 	exitCommentMode();
+	void	runGameFrame(int event);
+	void	runGuiFrame();
+	void	cleanupGui();
+	void	runDialogueFrame();
+	void	exitDialogueMode();
+	void	runCommentFrame();
+	void	enterCommentMode(ZonePtr z);
+	void	exitCommentMode();
 	void	updateView();
-	void 	drawAnimation(AnimationPtr anim);
-	void 	drawZone(ZonePtr zone);
+	void	drawAnimation(AnimationPtr anim);
+	void	drawZone(ZonePtr zone);
 	void	updateZones();
 	void	doLocationEnterTransition();
 	void	allocateLocationSlot(const char *name);
 	void	finalizeLocationParsing();
 	void	showLocationComment(const Common::String &text, bool end);
-	void 	setupBalloonManager();
+	void	setupBalloonManager();
 
 public:
 	void	beep();
 	void	pauseJobs();
 	void	resumeJobs();
-	uint 	getInternLanguage();
-	void 	setInternLanguage(uint id);
-	void 	enterDialogueMode(ZonePtr z);
+	uint	getInternLanguage();
+	void	setInternLanguage(uint id);
+	void	enterDialogueMode(ZonePtr z);
 	void	scheduleLocationSwitch(const char *location);
 	void	showSlide(const char *name, int x = 0, int y = 0);
 
@@ -346,28 +346,28 @@ public:
 	void		clearLocationFlags(uint32 flags);
 	void		toggleLocationFlags(uint32 flags);
 	uint32		getLocationFlags();
-	bool 		checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y);
-	bool 		checkZoneBox(ZonePtr z, uint32 type, uint x, uint y);
-	bool 		checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y);
+	bool		checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y);
+	bool		checkZoneBox(ZonePtr z, uint32 type, uint x, uint y);
+	bool		checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y);
 	ZonePtr		hitZone(uint32 type, uint16 x, uint16 y);
 	void		runZone(ZonePtr z);
 	bool		pickupItem(ZonePtr z);
-	void 		updateDoor(ZonePtr z, bool close);
-	void 		showZone(ZonePtr z, bool visible);
+	void		updateDoor(ZonePtr z, bool close);
+	void		showZone(ZonePtr z, bool visible);
 	void		setBackground(const char *background, const char *mask, const char *path);
-	void 		highlightInventoryItem(ItemPosition pos);
-	int16 		getHoverInventoryItem(int16 x, int16 y);
-	int 		addInventoryItem(ItemName item);
-	int 		addInventoryItem(ItemName item, uint32 value);
-	void 		dropItem(uint16 v);
-	bool 		isItemInInventory(int32 v);
-	const 		InventoryItem* getInventoryItem(int16 pos);
-	int16 		getInventoryItemIndex(int16 pos);
-	void 		initInventory();
-	void 		destroyInventory();
-	void 		cleanInventory(bool keepVerbs = true);
-	void 		openInventory();
-	void 		closeInventory();
+	void		highlightInventoryItem(ItemPosition pos);
+	int16		getHoverInventoryItem(int16 x, int16 y);
+	int		addInventoryItem(ItemName item);
+	int		addInventoryItem(ItemName item, uint32 value);
+	void		dropItem(uint16 v);
+	bool		isItemInInventory(int32 v);
+	const		InventoryItem* getInventoryItem(int16 pos);
+	int16		getInventoryItemIndex(int16 pos);
+	void		initInventory();
+	void		destroyInventory();
+	void		cleanInventory(bool keepVerbs = true);
+	void		openInventory();
+	void		closeInventory();
 
 	virtual void parseLocation(const char* name) = 0;
 	virtual void changeLocation() = 0;
@@ -404,7 +404,7 @@ public:
 
 	virtual DialogueManager *createDialogueManager(ZonePtr z);
 
-	void 	switchBackground(const char* background, const char* mask);
+	void	switchBackground(const char* background, const char* mask);
 
 private:
 	bool				_inTestResult;
@@ -412,17 +412,17 @@ private:
 	ProgramParser_ns	*_programParser;
 
 private:
-	void 	initFonts();
-	void 	freeFonts();
-	void 	initResources();
+	void	initFonts();
+	void	freeFonts();
+	void	initResources();
 	void	startGui();
 	void	startCreditSequence();
 	void	startEndPartSequence();
 	void	loadProgram(AnimationPtr a, const char *filename);
 	void	freeLocation(bool removeAll);
-	void 	freeCharacter();
-	void 	startMovingSarcophagus(ZonePtr sarc);
-	void 	stopMovingSarcophagus();
+	void	freeCharacter();
+	void	startMovingSarcophagus(ZonePtr sarc);
+	void	stopMovingSarcophagus();
 
 
 	//  callables data
@@ -539,9 +539,9 @@ private:
 	void	initFonts();
 	void	freeFonts();
 	void	freeLocation(bool removeAll);
-	void 	loadProgram(AnimationPtr a, const char *filename);
-	void 	startGui(bool showSplash);
-	void 	freeCharacter();
+	void	loadProgram(AnimationPtr a, const char *filename);
+	void	startGui(bool showSplash);
+	void	freeCharacter();
 
 	typedef void (Parallaction_br::*Callable)(void*);
 	const Callable *_callables;
diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 5c47d0828e..2af2ec856d 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -190,8 +190,8 @@ protected:
 	Dialogue	*parseDialogue();
 	void		resolveDialogueForwards(Dialogue *dialogue, uint numQuestions, Table &forwards);
 	virtual Answer *parseAnswer();
-	void 		parseAnswerFlags(Answer *answer);
-	void 		parseAnswerBody(Answer *answer);
+	void		parseAnswerFlags(Answer *answer);
+	void		parseAnswerBody(Answer *answer);
 	Question	*parseQuestion();
 
 	void		parseZone(ZoneList &list, char *name);
@@ -200,9 +200,9 @@ protected:
 	void		parseAnimation(AnimationList &list, char *name);
 	void		parseCommands(CommandList&);
 	void		parseCommandFlags();
-	void 		parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap);
-	void 		saveCommandForward(const char *name, CommandPtr cmd);
-	void 		resolveCommandForwards();
+	void		parseCommandFlag(CommandPtr cmd, const char *flag, Table *table, bool checkTrap);
+	void		saveCommandForward(const char *name, CommandPtr cmd);
+	void		resolveCommandForwards();
 	void		createCommand(uint id);
 	void		addCommand();
 
@@ -307,9 +307,9 @@ protected:
 
 	virtual void	parseZoneTypeBlock(ZonePtr z);
 	void			parsePathData(ZonePtr z);
-	void 			parseGetData(ZonePtr z);
-	void 			parseDoorData(ZonePtr z);
-	void 			parseAnswerCounter(Answer *answer);
+	void			parseGetData(ZonePtr z);
+	void			parseDoorData(ZonePtr z);
+	void			parseAnswerCounter(Answer *answer);
 	virtual Answer *parseAnswer();
 
 public:
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index fc8447f20e..e00a9fa8b4 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -520,7 +520,7 @@ void PathWalker_BR::finalizeWalk(State &s) {
 	// TODO: Input::walkTo must be extended to support destination frame in addition to coordinates
 	if (_engineFlags & FINAL_WALK_FRAME) {	// this flag is set in readInput()
 		_engineFlags &= ~FINAL_WALK_FRAME;
-		_ch._a->_frame = _moveToF; 	// from readInput()...
+		_ch._a->_frame = _moveToF;	// from readInput()...
 	} else {
 		_ch._a->_frame = _dirFrame;	// from walk()
 	}
diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h
index 65ebdb8e97..3dd9ead3a4 100644
--- a/engines/parallaction/walk.h
+++ b/engines/parallaction/walk.h
@@ -69,7 +69,7 @@ class PathWalker_BR {
 		AnimationPtr	_a;
 		int				_walkDelay;
 		int				_fieldC;
-		Common::Point 	_startFoot;
+		Common::Point	_startFoot;
 		bool			_first;
 		int				_step;
 		int				_dirFrame;
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 4aa8f6ae27..7a08a0e6c9 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -2186,10 +2186,10 @@ void Interface::drawButtonBox(const Rect& rect, ButtonKind kind, bool down) {
 	_vm->_gfx->setPixelColor(x, ye, cornerColor);
 	_vm->_gfx->setPixelColor(xe, y, cornerColor);
 	_vm->_gfx->setPixelColor(xe, ye, cornerColor);
- 	_vm->_gfx->hLine(x + 1, y, x + w - 2, frameColor);
- 	_vm->_gfx->hLine(x + 1, ye, x + w - 2, frameColor);
- 	_vm->_gfx->vLine(x, y + 1, y + h - 2, frameColor);
- 	_vm->_gfx->vLine(xe, y + 1, y + h - 2, frameColor);
+	_vm->_gfx->hLine(x + 1, y, x + w - 2, frameColor);
+	_vm->_gfx->hLine(x + 1, ye, x + w - 2, frameColor);
+	_vm->_gfx->vLine(x, y + 1, y + h - 2, frameColor);
+	_vm->_gfx->vLine(xe, y + 1, y + h - 2, frameColor);
 
 	x++;
 	y++;
diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp
index 599fde20e5..f432dbd304 100644
--- a/engines/saga/render.cpp
+++ b/engines/saga/render.cpp
@@ -220,8 +220,8 @@ void Render::addDirtyRect(Common::Rect rect) {
 	if (x2 > x1 && y2 > y1) {
 		Common::Rect rectClipped(x1, y1, x2, y2);
 		// Check if the new rectangle is contained within another in the list
- 		Common::List<Common::Rect>::const_iterator it;
- 		for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+		Common::List<Common::Rect>::const_iterator it;
+		for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
 			if (it->contains(rectClipped))
 				return;
 			if (rectClipped.contains(*it)) {
@@ -236,8 +236,8 @@ void Render::addDirtyRect(Common::Rect rect) {
 
 void Render::restoreChangedRects() {
 	if (!_fullRefresh) {
- 	 	Common::List<Common::Rect>::const_iterator it;
- 	 	for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+		Common::List<Common::Rect>::const_iterator it;
+		for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
 			//_backGroundSurface.frameRect(*it, 1);		// DEBUG
 			if (_vm->_interface->getFadeMode() != kFadeOut)
 				g_system->copyRectToScreen(_vm->_gfx->getBackBufferPixels(), _backGroundSurface.w, it->left, it->top, it->width(), it->height());
@@ -248,8 +248,8 @@ void Render::restoreChangedRects() {
 
 void Render::drawDirtyRects() {
 	if (!_fullRefresh) {
- 	 	Common::List<Common::Rect>::const_iterator it;
- 	 	for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
+		Common::List<Common::Rect>::const_iterator it;
+		for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
 			//_backGroundSurface.frameRect(*it, 2);		// DEBUG
 			if (_vm->_interface->getFadeMode() != kFadeOut)
 				g_system->copyRectToScreen(_vm->_gfx->getBackBufferPixels(), _backGroundSurface.w, it->left, it->top, it->width(), it->height());
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 626271c371..2ebf9bea48 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -308,14 +308,14 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 	},
 
 	{{"longbow", "", {
- 	      {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
- 	      {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
- 	      {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
- 	      {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
- 	      {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
- 	      {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
- 	      {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
- 	      {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
+	      {"resource.002", 0, "7f6ce331219d58d5087731e4475ab4f1", 1128555},
+	      {"resource.003", 0, "21ebe6b39b57a73fc449f67f013765aa", 972635},
+	      {"resource.000", 0, "36e8fda5d0b8c49e587c8a9617959f72", 1096767},
+	      {"resource.001", 0, "d4c299213f8d799da1492680d12d0fb3", 1133226},
+	      {"resource.map", 0, "36d3b81ff75b67dd4d27b7f5d3166503", 6261},
+	      {"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1064637},
+	      {"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
+	      {"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
 	      {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
 	      {},
 	      SCI_VERSION_AUTODETECT,
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index 2a20d6fbdf..f5759b090b 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -899,7 +899,7 @@ yy_reduce_print (yyvsp, yyrule)
       fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+		      		       );
       fprintf (stderr, "\n");
     }
 }
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index f92c3b9226..e66156a482 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1496,17 +1496,17 @@ static sci_event_t scummvm_get_event(gfx_driver_t *drv) {
 		// We add the modifier key status to buckybits
 		// SDL sends a keydown event if a modifier key is turned on and a keyup event if it's off
 		//
- 	 	// FIXME: This code is semi-bogus. It only records the modifier key being *pressed*.
- 	 	// It does not track correctly whether capslock etc. is active. To do that, we
- 	 	// would have to record the fact that the modifier was pressed in global var,
- 	 	// and also watch for Common::EVENT_KEYUP events.
- 	 	// But this is still not quite good enough, because not all events might
- 	 	// pass through here (e.g. the GUI might be running with its own event loop).
- 	 	//
- 	 	// The best solution likely would be to add code to the EventManager class
- 	 	// for tracking which keys are pressed and which are not...
+		// FIXME: This code is semi-bogus. It only records the modifier key being *pressed*.
+		// It does not track correctly whether capslock etc. is active. To do that, we
+		// would have to record the fact that the modifier was pressed in global var,
+		// and also watch for Common::EVENT_KEYUP events.
+		// But this is still not quite good enough, because not all events might
+		// pass through here (e.g. the GUI might be running with its own event loop).
+		//
+		// The best solution likely would be to add code to the EventManager class
+		// for tracking which keys are pressed and which are not...
 		if (ev.type == Common::EVENT_KEYDOWN || ev.type == Common::EVENT_KEYUP) {
- 			switch (ev.kbd.keycode) {
+			switch (ev.kbd.keycode) {
 			case Common::KEYCODE_CAPSLOCK:
 				if (ev.type == Common::EVENT_KEYDOWN) {
 					_modifierStates |= SCI_EVM_CAPSLOCK;
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 3b3611ab50..f5cbd6aab9 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -174,7 +174,7 @@ void ScummEngine_v6::drawBlastTexts() {
 
 				// Some localizations may override colors
 				// See credits in Chinese COMI
-				if (_game.id == GID_CMI && 	_language == Common::ZH_TWN &&
+				if (_game.id == GID_CMI &&	_language == Common::ZH_TWN &&
 				      c == '^' && (buf == _blastTextQueue[i].text + 1)) {
 					if (*buf == 'c') {
 						int color = buf[3] - '0' + 10 *(buf[2] - '0');
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 4c7607b9c2..2b4a596f9a 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -272,8 +272,8 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M
 		DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle);
 		return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA);
 #else
- 	 	GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
- 	 	dialog.runModal();
+		GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
+		dialog.runModal();
 		return NULL;
 #endif
 	}
@@ -282,14 +282,14 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M
 	snprintf(filename, sizeof(filename), "%s.mp2", sequenceList[id]);
 
 	if (Common::File::exists(filename)) {
- 	 	GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
- 	 	dialog.runModal();
+		GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
+		dialog.runModal();
 		return NULL;
 	}
 
 	sprintf(buf, "Cutscene '%s' not found", sequenceList[id]);
- 	GUI::MessageDialog dialog(buf, "OK");
- 	dialog.runModal();
+	GUI::MessageDialog dialog(buf, "OK");
+	dialog.runModal();
 
 	return NULL;
 }
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 3e90f713bb..13354b31a3 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -1181,7 +1181,7 @@ bool Control::restoreGameFromFile(uint8 slot) {
 	inf->readUint16BE();	// save time
 
 	if (saveVersion < 2) { // Before version 2 we didn't had play time feature
-		SwordEngine::_systemVars.engineStartTime = 	_system->getMillis() / 1000; // Start counting
+		SwordEngine::_systemVars.engineStartTime =	_system->getMillis() / 1000; // Start counting
 	} else {
 		uint32 currentTime = _system->getMillis() / 1000;
 		SwordEngine::_systemVars.engineStartTime = currentTime - inf->readUint32BE(); // Engine start time
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index 4c1f39eea6..338b62f941 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -385,7 +385,7 @@ void Screen::draw(void) {
 	} else if (!(SwordEngine::isPsx())) {
 		memcpy(_screenBuf, _layerBlocks[0], _scrnSizeX * _scrnSizeY);
 	} else { //We are using PSX version
-		uint8 *indxScreen; 		
+		uint8 *indxScreen;		
 		if(_currentScreen == 45 || _currentScreen == 55 ||
 		   _currentScreen == 57 || _currentScreen == 63 || _currentScreen == 71) // Width shrinked backgrounds
 			indxScreen = psxShrinkedBackgroundToIndexed(_layerBlocks[0], _scrnSizeX, _scrnSizeY);
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index ab5a6e67a0..c2d92a6b29 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -334,8 +334,8 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s
 		DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle);
 		return new MoviePlayer(vm, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA);
 #else
- 	 	GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
- 	 	dialog.runModal();
+		GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK");
+		dialog.runModal();
 		return NULL;
 #endif
 	}
@@ -344,8 +344,8 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s
 	snprintf(filename, sizeof(filename), "%s.mp2", name);
 
 	if (Common::File::exists(filename)) {
- 	 	GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
- 	 	dialog.runModal();
+		GUI::MessageDialog dialog("MPEG2 cutscenes are no longer supported", "OK");
+		dialog.runModal();
 		return NULL;
 	}
 
@@ -353,8 +353,8 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s
 	// those warnings more discreet.
 	if (!vm->_logic->readVar(DEMO)) {
 		sprintf(buf, "Cutscene '%s' not found", name);
-	 	GUI::MessageDialog dialog(buf, "OK");
-	 	dialog.runModal();
+		GUI::MessageDialog dialog(buf, "OK");
+		dialog.runModal();
 	} else
 		warning("Cutscene '%s' not found", name);
 
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp
index 4d4587bf8b..279c482376 100644
--- a/engines/tinsel/actors.cpp
+++ b/engines/tinsel/actors.cpp
@@ -95,7 +95,7 @@ struct ACTORINFO {
 
 	const FREEL	*presReel;	// the present reel
 	int			presRnum;	// the present reel number
-	SCNHANDLE 	presFilm;	// the film that reel belongs to
+	SCNHANDLE	presFilm;	// the film that reel belongs to
 	OBJECT		*presObj;	// reference for position information
 	int			presPlayX, presPlayY;
 
@@ -108,9 +108,9 @@ struct ACTORINFO {
 
 	COLORREF	textColour;	// Text colour
 
-	SCNHANDLE 	playFilm;	// revert to this after talks
-	SCNHANDLE 	talkFilm;	// this be deleted in the future!
-	SCNHANDLE 	latestFilm;	// the last film ordered
+	SCNHANDLE	playFilm;	// revert to this after talks
+	SCNHANDLE	talkFilm;	// this be deleted in the future!
+	SCNHANDLE	latestFilm;	// the last film ordered
 	bool		bTalking;
 
 	int			steps;
@@ -162,7 +162,7 @@ static Z_POSITIONS zPositions[NUM_ZPOSITIONS];
  * @param num			Chunk Id
  */
 void RegisterActors(int num) {
-	if (actorInfo == NULL) 	{
+	if (actorInfo == NULL)	{
 		// Store the total number of actors in the game
 		NumActors = num;
 
diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h
index 03fd0151b4..74a5ba4185 100644
--- a/engines/tinsel/actors.h
+++ b/engines/tinsel/actors.h
@@ -147,7 +147,7 @@ struct SAVED_ACTOR {
 	short		zFactor;
 	bool		bAlive;
 	bool		bHidden;
-	SCNHANDLE 	presFilm;	//!< the film that reel belongs to
+	SCNHANDLE	presFilm;	//!< the film that reel belongs to
 	short		presRnum;	//!< the present reel number
 	short		presPlayX, presPlayY;
 };
diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h
index 245507841c..3b9d11fee6 100644
--- a/engines/tinsel/background.h
+++ b/engines/tinsel/background.h
@@ -93,7 +93,7 @@ void PlayfieldGetPos(		// Returns the xy position of the specified playfield in
 	int *pXpos,		// returns current x position
 	int *pYpos);		// returns current y position
 
-int PlayfieldGetCentreX( 	// Returns the xy position of the specified playfield in the current background
+int PlayfieldGetCentreX(	// Returns the xy position of the specified playfield in the current background
 	int which);		// which playfield
 
 OBJECT *GetPlayfieldList(	// Returns the display list for the specified playfield
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 2607ed068b..208184035b 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -97,8 +97,8 @@ bool bOldAudio;
 #define BIT0		0x01
 
 #define CD_XSCR		0x04	// Screen has a scroll offset
-#define CD_CMAP 	0x08	// Colour map is included
-#define CD_CMND 	0x10	// Command is included
+#define CD_CMAP	0x08	// Colour map is included
+#define CD_CMND	0x10	// Command is included
 #define CD_AUDIO	0x20	// Audio data is included
 #define CD_EXTEND	0x40	// Extended modes "A"-"z"
 #define CD_PRINT	0x80	// goes in conjunction with CD_CMD
@@ -264,7 +264,7 @@ static void PrepBMV(const byte *sourceData, int length, short deltaFetchDisp) {
 			firstLoop = false;
 		}
 
- 		// Is lo nibble '00xx'?
+		// Is lo nibble '00xx'?
 		if ((eax & 0xC) == 0) {
 			for (;;) {
 //@_rDN_Lp_1:
@@ -438,7 +438,7 @@ static void MoviePalette(int paletteOffset) {
 
 	r = bigBuffer + paletteOffset;
 
-	for (i = 0; i < 256; i++, r += 3) 	{
+	for (i = 0; i < 256; i++, r += 3)	{
 		moviePal[i] = TINSEL_RGB(*r, *(r + 1), *(r + 2));
 	}
 
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index 53ad6094da..1775eab891 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -303,7 +303,7 @@ void HideCursorTrails(void) {
 
 	bTempNoTrailers = true;
 
-	for (i = 0; i < numTrails; i++) 	{
+	for (i = 0; i < numTrails; i++)	{
 		if (ntrailData[i].trailObj != NULL) {
 			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
 			ntrailData[i].trailObj = NULL;
@@ -512,7 +512,7 @@ static void InitCurPos(void) {
 	DoCursorMove();
 	MultiHideObject(McurObj);
 
- 	IterationSize = ITERATION_BASE;
+	IterationSize = ITERATION_BASE;
 }
 
 /**
@@ -646,7 +646,7 @@ void DropCursor(void) {
 	bWhoa = true;		// Suspend cursor processes
 
 	for (int i = 0; i < numTrails; i++) {
-		if (ntrailData[i].trailObj != NULL) 		{
+		if (ntrailData[i].trailObj != NULL)		{
 			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
 			ntrailData[i].trailObj = NULL;
 		}
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index ce4ba5858b..2987e091b3 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -3584,7 +3584,7 @@ void SetConvDetails(CONV_PARAM fn, HPOLYGON hPoly, int ano) {
 	bMoveOnUnHide = true;
 
 	// Get the Actor Tag's or Tagged Actor's label for the conversation window title
-	if (hPoly != NOPOLY) 	{
+	if (hPoly != NOPOLY)	{
 		int x, y;
 		GetTagTag(hPoly, &InvD[INV_CONV].hInvTitle, &x, &y);
 	} else {
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index 2e87eb1715..a674211f66 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -115,7 +115,7 @@ bool GotoCD(void) {
 
 	currentCD = nextCD;
 
-/*	if (bNoCD) 	{
+/*	if (bNoCD)	{
 		strcpy(cdDirectory, hdDirectory);
 		cdLastBit[3] = currentCD;
 		strcat(cdDirectory, cdLastBit);
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index ba09675b3f..ca91670bee 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -235,7 +235,7 @@ void LoadCDGraphData(MEMHANDLE *pH) {
 	bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
 
 	// New code to try and handle CD read failures 24/2/97
-	while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) 	{
+	while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES)	{
 		// Try again
 		cdGraphStream.seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
 		bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp
index 8c09787690..a7cf95bc62 100644
--- a/engines/tinsel/mareels.cpp
+++ b/engines/tinsel/mareels.cpp
@@ -155,7 +155,7 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) {
 	else
 		d = D_UP;
 
-	for (int i = 0; i < scrEntries; i++) 	{
+	for (int i = 0; i < scrEntries; i++)	{
 		if (SCIdata[i].actor == ano && SCIdata[i].scale == scale1 && SCIdata[i].direction == d) {
 			if (SCIdata[i].reels[reel] == TF_NONE)
 				return 0;
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index 4422a7cf4a..621d069aa5 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -726,7 +726,7 @@ static void SetNextDest(PMOVER pMover) {
 			GotThere(pMover);
 			return;
 		} else {
- 			assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001
+			assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001
 			SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 		}
 	}
@@ -775,7 +775,7 @@ static void SetNextDest(PMOVER pMover) {
 		// Fall through for LEAVING
 
 	case LEAVING:
- 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002
+		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002
 		SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 		targetX = pMover->ItargetX;	// Desired position
 		targetY = pMover->ItargetY;
@@ -807,7 +807,7 @@ static void SetNextDest(PMOVER pMover) {
 			} else {
 				// Last node - we're off
 				pMover->npstatus = LEAVING;
-		 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003
+				assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003
 				SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 				targetX = pMover->ItargetX;	// Desired position
 				targetY = pMover->ItargetY;
@@ -840,7 +840,7 @@ static void SetNextDest(PMOVER pMover) {
 			} else {
 				// Last node - we're off
 				pMover->npstatus = LEAVING;
-		 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004
+				assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004
 				SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 				targetX = pMover->ItargetX;	// Desired position
 				targetY = pMover->ItargetY;
@@ -1396,7 +1396,7 @@ int SetActorDest(PMOVER pMover, int clickX, int clickY, bool igPath, SCNHANDLE h
 		}
 	}
 
- 	assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005
+	assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005
 	SetMoverUltDest(pMover, targetX, targetY);
 	SetMoverIntDest(pMover, targetX, targetY);
 
@@ -1454,7 +1454,7 @@ static void NotMoving(PMOVER pActor, int x, int y) {
 	if (pActor->ItargetX != -1 || pActor->ItargetY != -1) {
 		SetNextDest(pActor);
 	} else if (pActor->UtargetX != -1 || pActor->UtargetY != -1) {
- 		assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006
+		assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006
 		SetMoverIntDest(pActor, pActor->UtargetX, pActor->UtargetY);
 		SetNextDest(pActor);
 	}
@@ -1516,7 +1516,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) {
 		if (lastnode == firstnode) {
 			pMover->hFnpath = NOPOLY;
 			pMover->npstatus = NOT_IN;
-	 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007
+			assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007
 			SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 			SetNextDest(pMover);
 		} else {
@@ -1526,7 +1526,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) {
 			pMover->hFnpath = hPath;
 			pMover->line = firstnode ? firstnode - 1 : firstnode;
 			if (pMover->line == pMover->Tline && hPath == pMover->hUpath) {
-		 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008
+				assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008
 				SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY);
 				SetMoverDest(pMover, pMover->UtargetX, pMover->UtargetY);
 			} else {
@@ -1547,7 +1547,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) {
 	} else {
 		pMover->hFnpath = NOPOLY;
 		pMover->npstatus = NOT_IN;
- 		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009
+		assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009
 
 		// Added 26/01/95
 		if (IsPolyCorner(hPath, pMover->ItargetX, pMover->ItargetY))
@@ -1735,7 +1735,7 @@ void DoMoveActor(PMOVER pActor) {
 	MoveActor(pActor);
 
 	if ((pActor->targetX != -1 || pActor->targetY != -1)
-	&&  (wasx == pActor->objX && wasy == pActor->objY)) 	{
+	&&  (wasx == pActor->objX && wasy == pActor->objY))	{
 		for (i=0; i < NUMBER; i++) {
 			MoveActor(pActor);
 			if (wasx != pActor->objX || wasy != pActor->objY)
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 0fbd935507..51ae012e3d 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -141,7 +141,7 @@ const int enhancedAudioSCNVersion[] = {
 	  84,  85,  86, 3124,  88,  89,  90,  88,   2,   2,	// 121-130
 	   2,   2,   2,    2,   2,   2,   2,   2,   2,   2,	// 131-140
 	3141,  91,  92,   93,  94,  94,  95,  96,  52,   4,	// 141-150
-	  97,  98,  99,   99                              	// 151-154
+	  97,  98,  99,   99                             	// 151-154
 };
 
 int GetTrackNumber(SCNHANDLE hMidi) {
@@ -252,7 +252,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
 		// Store the length
 		//dwLastSeqLen = dwSeqLen;
 	} else {
-	  	// dwFileOffset == dwLastMidiIndex
+	 	// dwFileOffset == dwLastMidiIndex
 		_vm->_midiMusic->stop();
 		_vm->_midiMusic->playXMIDI(midiBuffer.pDat, dwSeqLen, bLoop);
 	}
@@ -301,7 +301,7 @@ int GetMidiVolume() {
 void SetMidiVolume(int vol)	{
 	assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume);
 
-	if (vol == 0 && volMusic == 0) 	{
+	if (vol == 0 && volMusic == 0)	{
 		// Nothing to do
 	} else if (vol == 0 && volMusic != 0) {
 		// Stop current midi sequence
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index b90a90bfc2..33550b39e8 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -230,7 +230,7 @@ void FreeMasterInterpretContext(void) {
 	INT_CONTEXT *pic;
 	int	i;
 
-	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) 	{
+	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++)	{
 		if ((pic->GSort == GS_MASTER) || (pic->GSort == GS_GPROCESS)) {
 			memset(pic, 0, sizeof(INT_CONTEXT));
 			pic->GSort = GS_NONE;
@@ -762,7 +762,7 @@ void CheckOutWaiters(void) {
 	int i, j;
 
 	// Check all waited for have someone waiting
-	for (i = 0; i < NUM_INTERPRET; i++) 	{
+	for (i = 0; i < NUM_INTERPRET; i++)	{
 		// If someone is supposedly waiting for this one
 		if ((icList + i)->GSort != GS_NONE && (icList + i)->waitNumber2) {
 			// Someone really must be waiting for this one
diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h
index ec8b9e4587..0c75cc0df1 100644
--- a/engines/tinsel/pcode.h
+++ b/engines/tinsel/pcode.h
@@ -129,7 +129,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result);
 #define CONV_END	2	//
 
 #define CONTROL_OFF	0	// control()
-#define CONTROL_ON	1	// 	parameter
+#define CONTROL_ON	1	//	parameter
 #define CONTROL_OFFV	2	//
 #define CONTROL_OFFV2	3	//
 #define CONTROL_STARTOFF 4	//
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 0eecaf28ef..9f0a592be0 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -270,7 +270,7 @@ void DisablePointing(CORO_PARAM) {
 
 	bPointingActive = false;
 
-	for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++) 	{
+	for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++)	{
 		_ctx->hPoly = GetPolyHandle(_ctx->i);
 
 		if (_ctx->hPoly != NOPOLY && PolyType(_ctx->hPoly) == TAG && PolyIsPointedTo(_ctx->hPoly)) {
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index e297cb0316..90709f6d31 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -50,7 +50,7 @@ struct PPINIT {
 	int16	y;			// } - set to (-1, -1) if none.
 	int16	z;			// normally 0, set if from restore
 	int16	speed;		// Film speed
-	int16 	actorid;	// Set if called from an actor code block
+	int16	actorid;	// Set if called from an actor code block
 	uint8	splay;		// Set if called from splay()
 	uint8	bTop;		// Set if called from topplay()
 	uint8	bRestore;
@@ -996,7 +996,7 @@ void PlayFilm(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool splay
 	ppi.bTop = bTop;
 	ppi.sf = sfact;
 	ppi.escOn = escOn;
- 	ppi.myescEvent = myescEvent;
+	ppi.myescEvent = myescEvent;
 
 	// Start display process for each reel in the film
 	for (int i = FROM_LE_32(pFilm->numreels) - 1; i >= 0; i--) {
diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp
index 33273ad372..03ca9c074d 100644
--- a/engines/tinsel/rince.cpp
+++ b/engines/tinsel/rince.cpp
@@ -761,7 +761,7 @@ void T1MoverProcess(CORO_PARAM, const void *param) {
 
 	while (1) {
 		if (pActor->bSpecReel) {
- 			if (!pActor->bHidden)
+			if (!pActor->bHidden)
 #ifdef DEBUG
 			assert(StepAnimScript(&pActor->actorAnim) != ScriptFinished); // Actor reel has finished!
 #else
diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp
index b7cfb22473..295df019c8 100644
--- a/engines/tinsel/sched.cpp
+++ b/engines/tinsel/sched.cpp
@@ -671,7 +671,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) {
  */
 void KillGlobalProcesses(void) {
 
-	for (uint32 i = 0; i < numGlobalProcess; ++i) 	{
+	for (uint32 i = 0; i < numGlobalProcess; ++i)	{
 		g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
 	}
 }
@@ -692,7 +692,7 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai
 	uint32	i;		// Loop counter
 	_ctx->pProc = NULL;
 
-	for (i = 0; i < numGlobalProcess; ++i) 	{
+	for (i = 0; i < numGlobalProcess; ++i)	{
 		if (pGlobalProcess[i].processId == procID) {
 			assert(pGlobalProcess[i].hProcessCode);		// Must have some code to run
 
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 3a03fea6ef..5c4f74e0d2 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -325,7 +325,7 @@ int8 SoundManager::getPan(int x) {
  * @param id			Identifier of sample to be checked
  */
 bool SoundManager::sampleExists(int id) {
-	if (_vm->_mixer->isReady()) 	{
+	if (_vm->_mixer->isReady())	{
 		// make sure id is in range
 		if (id > 0 && id < _sampleIndexLen) {
 			// check for a sample index
@@ -406,7 +406,7 @@ void SoundManager::openSampleFiles(void) {
 		return;
 
 	// open sample index file in binary mode
-	if (f.open(_vm->getSampleIndex(sampleLanguage))) 	{
+	if (f.open(_vm->getSampleIndex(sampleLanguage)))	{
 		// get length of index file
 		f.seek(0, SEEK_END);		// move to end of file
 		_sampleIndexLen = f.pos();	// get file pointer
@@ -445,7 +445,7 @@ void SoundManager::openSampleFiles(void) {
 		char buf[50];
 		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
 		GUI::MessageDialog dialog(buf, "OK");
- 	 	dialog.runModal();
+		dialog.runModal();
 
 		error(CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
 	}
@@ -455,7 +455,7 @@ void SoundManager::openSampleFiles(void) {
 		char buf[50];
 		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
 		GUI::MessageDialog dialog(buf, "OK");
- 	 	dialog.runModal();
+		dialog.runModal();
 
 		error(CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
 	}
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 60ac8cdb2a..bbf02301db 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -100,7 +100,7 @@ void ChangeLanguage(LANGUAGE newLang) {
 			char buf[50];
 			sprintf(buf, CANNOT_FIND_FILE, _vm->getTextFile(newLang));
 			GUI::MessageDialog dialog(buf, "OK");
- 	 		dialog.runModal();
+			dialog.runModal();
 
 			error(CANNOT_FIND_FILE, _vm->getTextFile(newLang));
 		}
diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp
index 7196e7597d..c489e4523b 100644
--- a/engines/tinsel/sysvar.cpp
+++ b/engines/tinsel/sysvar.cpp
@@ -93,7 +93,7 @@ static int systemVars[SV_TOPVALID] = {
 		0,		// SYS_MaximumYoffset
 
 		0,		// SYS_DefaultFxDimFactor
-		0, 		// SYS_SceneFxDimFactor
+		0,		// SYS_SceneFxDimFactor
 
 		0x606060,	// SYS_HighlightRGB
 		WIN_PC,		// SYS_Platform,
diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp
index 8446aad0fa..fa74797dd9 100644
--- a/engines/tinsel/timers.cpp
+++ b/engines/tinsel/timers.cpp
@@ -41,7 +41,7 @@ namespace Tinsel {
 #define MAX_TIMERS 16
 
 struct TIMER {
-	int 	tno;		/**< Timer number */
+	int	tno;		/**< Timer number */
 	int		ticks;		/**< Tick count */
 	int		secs;		/**< Second count */
 	int		delta;		/**< Increment/decrement value */
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index f7aefc5494..d5360b53ed 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -474,7 +474,7 @@ void TinGetVersion(WHICH_VER which, char *buffer, int length) {
 
 	char *cptr = (char *)FindChunk(MASTER_SCNHANDLE, CHUNK_TIME_STAMPS);
 
-	switch (which) 	{
+	switch (which)	{
 	case VER_GLITTER:
 		memcpy(buffer, cptr, length);
 		break;
@@ -1977,7 +1977,7 @@ static void Print(CORO_PARAM, int x, int y, SCNHANDLE text, int time, bool bSust
 			if (_ctx->bSample) {
 				// Wait for sample to end whether or not
 				if (!_vm->_mixer->isSoundHandleActive(_ctx->handle)) {
-					if (_ctx->pText == NULL || speedText == DEFTEXTSPEED) 				{
+					if (_ctx->pText == NULL || speedText == DEFTEXTSPEED)				{
 						// No text or speed modification - just depends on sample
 						break;
 					} else {
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 420b988976..aeaf5eff06 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1055,7 +1055,7 @@ void TuckerEngine::updateCursor() {
 			} else {
 				moveUpInventoryObjects();
 			}
- 		} else {
+		} else {
 			if (_selectedObjectType == 3) {
 				setActionForInventoryObject();
 			} else if (_actionVerb != 0) {