Whitespace cleanup: Convert space followed by tab to just tab

svn-id: r39203

13 files changed, 107 insertions, 107 deletions

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;