WINTERMUTE: AStyle-formatting.

31 files changed, 167 insertions, 167 deletions

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index b25bbf024d..c296f88699 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -119,7 +119,7 @@ bool BaseFileManager::addPath(TPathType type, const Common::FSNode &path) {
 

 	switch (type) {

 	case PATH_SINGLE:

-	//	_singlePaths.push_back(path);

+		//  _singlePaths.push_back(path);

 		error("TODO: Allow adding single-paths");

 		break;

 	case PATH_PACKAGE:

@@ -154,7 +154,7 @@ bool BaseFileManager::initPaths() {
 		Common::String path = entries->nextToken();

 		if (path.size() > 0) {

 			error("BaseFileManager::initPaths - Game wants to add customPath: %s", path.c_str()); // TODO

-			//			addPath(PATH_SINGLE, path);

+			//          addPath(PATH_SINGLE, path);

 		}

 	}

 	delete entries;

@@ -170,7 +170,7 @@ bool BaseFileManager::initPaths() {
 		Common::String path = entries->nextToken();

 		if (path.size() > 0) {

 			error("BaseFileManager::initPaths - Game wants to add packagePath: %s", path.c_str()); // TODO

-			//			addPath(PATH_SINGLE, path);

+			//          addPath(PATH_SINGLE, path);

 		}

 	}

 	delete entries;

@@ -244,7 +244,7 @@ Common::SeekableReadStream *BaseFileManager::openPkgFile(const Common::String &f
 	Common::SeekableReadStream *file = NULL;

 	char fileName[MAX_PATH_LENGTH];

 	strcpy(fileName, upcName.c_str());

-	

+

 	// correct slashes

 	for (int32 i = 0; i < upcName.size(); i++) {

 		if (upcName[i] == '/')

@@ -300,7 +300,7 @@ Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &f
 		BaseSaveThumbFile *SaveThumbFile = new BaseSaveThumbFile(_gameRef);

 		if (DID_SUCCEED(SaveThumbFile->open(filename))) {

 			ret = SaveThumbFile->getMemStream();

-		} 

+		}

 		delete SaveThumbFile;

 		return ret;

 	}

diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h
index e3c20378bb..c49bbe3815 100644
--- a/engines/wintermute/base/base_file_manager.h
+++ b/engines/wintermute/base/base_file_manager.h
@@ -52,7 +52,7 @@ public:
 private:

 	typedef enum {

 	    PATH_PACKAGE,

-		PATH_SINGLE

+	    PATH_SINGLE

 	} TPathType;

 	bool reloadPaths();

 	bool initPaths();

diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 77e959f11b..67edccd041 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -61,7 +61,7 @@ BaseFrame::~BaseFrame() {
 	delete _sound;

 	_sound = NULL;

 

-	for (int i = 0; i < _subframes.getSize(); i++) 

+	for (int i = 0; i < _subframes.getSize(); i++)

 		delete _subframes[i];

 	_subframes.removeAll();

 

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 63040f2db2..b2b92d6de4 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -259,10 +259,10 @@ BaseGame::BaseGame(): BaseObject(this) {
 	_autoSaveSlot = 999;

 	_cursorHidden = false;

 

-/*#ifdef __IPHONEOS__

-	_touchInterface = true;

-	_constrainedMemory = true; // TODO differentiate old and new iOS devices

-#else*/

+	/*#ifdef __IPHONEOS__

+	    _touchInterface = true;

+	    _constrainedMemory = true; // TODO differentiate old and new iOS devices

+	#else*/

 	_touchInterface = false;

 	_constrainedMemory = false;

 //#endif

@@ -460,7 +460,7 @@ bool BaseGame::initialize1() {
 		if (_fader == NULL)

 			break;

 		registerObject(_fader);

-		

+

 		loaded = true;

 	}

 	if (loaded == true) {

@@ -2120,9 +2120,9 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "ShowStatusLine") == 0) {

 		stack->correctParams(0);

-/*#ifdef __IPHONEOS__

-		IOS_ShowStatusLine(TRUE);

-#endif*/

+		/*#ifdef __IPHONEOS__

+		        IOS_ShowStatusLine(TRUE);

+		#endif*/

 		stack->pushNULL();

 

 		return STATUS_OK;

@@ -2133,9 +2133,9 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "HideStatusLine") == 0) {

 		stack->correctParams(0);

-/*#ifdef __IPHONEOS__

-		IOS_ShowStatusLine(FALSE);

-#endif*/

+		/*#ifdef __IPHONEOS__

+		        IOS_ShowStatusLine(FALSE);

+		#endif*/

 		stack->pushNULL();

 

 		return STATUS_OK;

@@ -3919,9 +3919,9 @@ bool BaseGame::getCurrentViewportRect(Rect32 *rect, bool *custom) {
 			if (custom) *custom = true;

 		} else {

 			BasePlatform::setRect(rect,   _renderer->_drawOffsetX,

-			                    _renderer->_drawOffsetY,

-			                    _renderer->_width + _renderer->_drawOffsetX,

-			                    _renderer->_height + _renderer->_drawOffsetY);

+			                      _renderer->_drawOffsetY,

+			                      _renderer->_width + _renderer->_drawOffsetX,

+			                      _renderer->_height + _renderer->_drawOffsetY);

 			if (custom) *custom = false;

 		}

 

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 34dec89d20..8da62af40a 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -212,7 +212,7 @@ public:
 	virtual bool loadGame(const char *filename);

 	virtual bool saveGame(int slot, const char *desc, bool quickSave = false);

 	virtual bool showCursor();

-	

+

 	BaseObject *_activeObject;

 

 	bool _interactive;

@@ -296,21 +296,21 @@ private:
 	int _indicatorY;

 	int _indicatorWidth;

 	int _indicatorHeight;

-	

+

 	char *_localSaveDir;

 	bool _saveDirChecked;

 	bool _richSavedGames;

 	char *_savedGameExt;

-	

+

 	char *_loadImageName;

 	char *_saveImageName;

 	int _saveImageX;

 	int _saveImageY;

 	int _loadImageX;

 	int _loadImageY;

-	

+

 	BaseSurface *_saveLoadImage;

-	

+

 	bool _reportTextureFormat;

 

 	// FPS stuff

@@ -328,7 +328,7 @@ private:
 	bool _compressedSavegames;

 

 	bool _personalizedSave;

-	

+

 	bool emptySaveSlot(int slot);

 	bool isSaveSlotUsed(int slot);

 	bool getSaveSlotDescription(int slot, char *buffer);

@@ -353,7 +353,7 @@ private:
 

 	uint32 _fps;

 	bool updateMusicCrossfade();

-	

+

 	bool isVideoPlaying();

 	bool stopVideo();

 

diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index a85ec3e972..03f9929eee 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -266,36 +266,36 @@ uint32 BaseKeyboardState::keyCodeToVKey(Common::Event *event) {
 }

 

 enum VKeyCodes {

-	VK_SPACE = 32,

-	VK_LEFT = 37,

-	VK_UP = 38,

-	VK_RIGHT = 39,

-	VK_DOWN = 40

+    VK_SPACE = 32,

+    VK_LEFT = 37,

+    VK_UP = 38,

+    VK_RIGHT = 39,

+    VK_DOWN = 40

 };

 

 //////////////////////////////////////////////////////////////////////////

 Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {

 	// todo

 	switch (vkey) {

-		case VK_SPACE:

-			return Common::KEYCODE_SPACE;

-			break;

-		case VK_LEFT:

-			return Common::KEYCODE_LEFT;

-			break;

-		case VK_RIGHT:

-			return Common::KEYCODE_RIGHT;

-			break;

-		case VK_UP:

-			return Common::KEYCODE_UP;

-			break;

-		case VK_DOWN:

-			return Common::KEYCODE_DOWN;

-			break;

-		default:

-			warning("Unknown VKEY: %d", vkey);

-			return (Common::KeyCode)vkey;

-			break;

+	case VK_SPACE:

+		return Common::KEYCODE_SPACE;

+		break;

+	case VK_LEFT:

+		return Common::KEYCODE_LEFT;

+		break;

+	case VK_RIGHT:

+		return Common::KEYCODE_RIGHT;

+		break;

+	case VK_UP:

+		return Common::KEYCODE_UP;

+		break;

+	case VK_DOWN:

+		return Common::KEYCODE_DOWN;

+		break;

+	default:

+		warning("Unknown VKEY: %d", vkey);

+		return (Common::KeyCode)vkey;

+		break;

 	}

 

 }

diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index 588d210134..12ed67ba2a 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -180,7 +180,7 @@ char *BaseParser::getAssignmentText(char **buf) {
 				break;

 			++*buf;

 		}

-		**buf = 0;                 // null terminate it

+		**buf = 0;               // null terminate it

 		if (theChar)                  // skip the terminator

 			++*buf;

 	}

diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h
index a5c55ceb41..03ca71b48d 100644
--- a/engines/wintermute/base/base_parser.h
+++ b/engines/wintermute/base/base_parser.h
@@ -60,7 +60,7 @@ namespace WinterMute {
 class BaseParser : public BaseClass {

 public:

 	struct TokenDesc {

-		int32	id;

+		int32   id;

 		const char *token;

 	};

 

diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 3f9e8de855..cf7deb2970 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -420,12 +420,12 @@ Common::String BasePersistenceManager::getStringObj() {
 	_loadStream->read(ret, len);

 	ret[len] = '\0';

 

-	Common::String retString = ret; 

+	Common::String retString = ret;

 	delete[] ret;

 

 	if (retString == "(null)") {

 		retString = "";

-	} 

+	}

 

 	return retString;

 }

diff --git a/engines/wintermute/base/base_registry.cpp b/engines/wintermute/base/base_registry.cpp
index dfab1b5076..7eb2685746 100644
--- a/engines/wintermute/base/base_registry.cpp
+++ b/engines/wintermute/base/base_registry.cpp
@@ -103,7 +103,7 @@ int BaseRegistry::readInt(const AnsiString &subKey, const AnsiString &key, int i
 				return init;

 			}

 		}

-	} 

+	}

 	AnsiString val = readString(subKey, key, "");

 	if (val.empty()) return init;

 	else return atoi(val.c_str());

@@ -126,7 +126,7 @@ bool BaseRegistry::writeInt(const AnsiString &subKey, const AnsiString &key, int
 			error("This key shouldn't be read by the scripts");

 			return true;

 		}

-	} 

+	}

 	writeString(subKey, key, StringUtil::toString(value));

 	return true;

 }

diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 03b0ef3615..c2e57f9fd6 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -583,7 +583,7 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	else if (strcmp(name, "InsertFrame") == 0) {

 		stack->correctParams(2);

 		int index = stack->pop()->getInt();

-		if (index < 0) 

+		if (index < 0)

 			index = 0;

 

 		ScValue *val = stack->pop();

diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 0b87dd2b7a..523bbed866 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -239,10 +239,10 @@ bool BaseSubFrame::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, flo
 	float ratioY = scaleY / 100.0f;

 

 	BasePlatform::setRect(rect,

-	                    (int)(x - _hotspotX * ratioX),

-	                    (int)(y - _hotspotY * ratioY),

-	                    (int)(x - _hotspotX * ratioX + (_rect.right - _rect.left) * ratioX),

-	                    (int)(y - _hotspotY * ratioY + (_rect.bottom - _rect.top) * ratioY));

+	                      (int)(x - _hotspotX * ratioX),

+	                      (int)(y - _hotspotY * ratioY),

+	                      (int)(x - _hotspotX * ratioX + (_rect.right - _rect.left) * ratioX),

+	                      (int)(y - _hotspotY * ratioY + (_rect.bottom - _rect.top) * ratioY));

 	return true;

 }

 

diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index 53dd99aac2..eeaacd2063 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -69,7 +69,7 @@ bool BaseTransitionMgr::start(TTransitionType type, bool nonInteractive) {
 		_origInteractive = _gameRef->_interactive;

 		_gameRef->_interactive = false;

 	} /*else _preserveInteractive */;

-	

+

 

 	_type = type;

 	_state = TRANS_MGR_RUNNING;

diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 1598101036..bb8504d2f4 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -46,7 +46,7 @@ void correctSlashes(char *fileName) {
 }

 

 // Parse a relative path in the game-folder, and if it exists, return a FSNode to it.

-static Common::FSNode getNodeForRelativePath(const Common::String& filename) {

+static Common::FSNode getNodeForRelativePath(const Common::String &filename) {

 	// The filename can be an explicit path, thus we need to chop it up, expecting the path the game

 	// specifies to follow the Windows-convention of folder\subfolder\file (absolute paths should not happen)

 

@@ -88,11 +88,11 @@ static Common::FSNode getNodeForRelativePath(const Common::String& filename) {
 	return Common::FSNode();

 }

 

-bool diskFileExists(const Common::String& filename) {

+bool diskFileExists(const Common::String &filename) {

 	// Try directly from SearchMan first

 	Common::ArchiveMemberList files;

 	SearchMan.listMatchingMembers(files, filename);

-	

+

 	for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); it++) {

 		if ((*it)->getName() == filename) {

 			return true;

@@ -112,7 +112,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 	// Try directly from SearchMan first

 	Common::ArchiveMemberList files;

 	SearchMan.listMatchingMembers(files, filename);

-	

+

 	for (Common::ArchiveMemberList::iterator it = files.begin(); it != files.end(); it++) {

 		if ((*it)->getName() == filename) {

 			file = (*it)->createReadStream();

diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h
index 0653b2e854..99a9e8b9a3 100644
--- a/engines/wintermute/base/file/base_disk_file.h
+++ b/engines/wintermute/base/file/base_disk_file.h
@@ -34,7 +34,7 @@
 namespace WinterMute {

 

 Common::SeekableReadStream *openDiskFile(const Common::String &filename);

-bool diskFileExists(const Common::String& filename);

+bool diskFileExists(const Common::String &filename);

 

 } // end of namespace WinterMute

 

diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index 5032650704..8282079c86 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -62,11 +62,11 @@ public:
 Common::SeekableReadStream *BaseFileEntry::createReadStream() const {

 	Common::SeekableReadStream *file = _package->getFilePointer();

 	if (!file) return NULL;

-	

+

 	// TODO: Cleanup

 	bool compressed = (_compressedLength != 0);

 	/* _size = fileEntry->_length; */

-	

+

 	if (compressed) {

 		// TODO: Really, most of this logic might be doable directly in the fileEntry?

 		// But for now, this should get us rolling atleast.

@@ -77,14 +77,14 @@ Common::SeekableReadStream *BaseFileEntry::createReadStream() const {
 	if (file->size() == 0) {

 		file = new CBPkgFile(file, _length);

 	}

-	

+

 	file->seek(0);

-	

+

 	return file;

 }

 

 //////////////////////////////////////////////////////////////////////////

-BaseFileEntry::BaseFileEntry(){

+BaseFileEntry::BaseFileEntry() {

 	_package = NULL;

 	_length = _compressedLength = _offset = _flags = 0;

 	_filename = "";

diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index 90bb027042..f2d2378c6a 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -51,33 +51,33 @@ Common::SeekableReadStream *BasePackage::getFilePointer() {
 

 static bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset) {

 	byte buf[32768];

-	

+

 	byte signature[8];

 	((uint32 *)signature)[0] = PACKAGE_MAGIC_1;

 	((uint32 *)signature)[1] = PACKAGE_MAGIC_2;

-	

+

 	uint32 fileSize = (uint32)f->size();

 	uint32 startPos = 1024 * 1024;

 	uint32 bytesRead = startPos;

-	

+

 	while (bytesRead < fileSize - 16) {

 		uint32 toRead = MIN((unsigned int)32768, fileSize - bytesRead);

 		f->seek((int32)startPos, SEEK_SET);

 		uint32 actuallyRead = f->read(buf, toRead);

 		if (actuallyRead != toRead) return false;

-		

+

 		for (uint32 i = 0; i < toRead - 8; i++)

 			if (!memcmp(buf + i, signature, 8)) {

 				*offset =  startPos + i;

 				return true;

 			}

-		

+

 		bytesRead = bytesRead + toRead - 16;

 		startPos = startPos + toRead - 16;

-		

+

 	}

 	return false;

-	

+

 }

 

 PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool searchSignature) {

@@ -98,7 +98,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 			boundToExe = true;

 		}

 	}

-	

+

 	TPackageHeader hdr;

 	hdr.readFromStream(stream);

 	if (hdr._magic1 != PACKAGE_MAGIC_1 || hdr._magic2 != PACKAGE_MAGIC_2 || hdr._packageVersion > PACKAGE_VERSION) {

@@ -106,7 +106,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 		delete stream;

 		return;

 	}

-	

+

 	if (hdr._packageVersion != PACKAGE_VERSION) {

 		debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "  Warning: package file '%s' is outdated.", filename.c_str());

 	}

@@ -125,7 +125,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 		pkg->_fsnode = file;

 

 		pkg->_boundToExe = boundToExe;

-		

+

 		// read package info

 		byte nameLength = stream->readByte();

 		char *pkgName = new char[nameLength];

@@ -141,15 +141,15 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 

 		// read file entries

 		uint32 numFiles = stream->readUint32LE();

-		

+

 		for (uint32 j = 0; j < numFiles; j++) {

 			char *name;

 			uint32 offset, length, compLength, flags, timeDate1, timeDate2;

-			

+

 			nameLength = stream->readByte();

 			name = new char[nameLength];

 			stream->read(name, nameLength);

-			

+

 			// v2 - xor name

 			if (hdr._packageVersion == PACKAGE_VERSION) {

 				for (int k = 0; k < nameLength; k++) {

@@ -157,18 +157,18 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 				}

 			}

 			debugC(kWinterMuteDebugFileAccess, "Package contains %s", name);

-			

+

 			Common::String upcName = name;

 			upcName.toUppercase();

 			delete[] name;

 			name = NULL;

-			

+

 			offset = stream->readUint32LE();

 			offset += absoluteOffset;

 			length = stream->readUint32LE();

 			compLength = stream->readUint32LE();

 			flags = stream->readUint32LE();

-			

+

 			if (hdr._packageVersion == PACKAGE_VERSION) {

 				timeDate1 = stream->readUint32LE();

 				timeDate2 = stream->readUint32LE();

@@ -181,12 +181,12 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 				fileEntry->_length = length;

 				fileEntry->_compressedLength = compLength;

 				fileEntry->_flags = flags;

-				

+

 				_files[upcName] = Common::ArchiveMemberPtr(fileEntry);

 			} else {

 				// current package has higher priority than the registered

 				// TODO: This cast might be a bit ugly.

-				BaseFileEntry *filePtr = (BaseFileEntry*) &*(_filesIter->_value);

+				BaseFileEntry *filePtr = (BaseFileEntry *) &*(_filesIter->_value);

 				if (pkg->_priority > filePtr->_package->_priority) {

 					filePtr->_package = pkg;

 					filePtr->_offset = offset;

@@ -198,12 +198,12 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 		}

 	}

 	debugC(kWinterMuteDebugFileAccess, "  Registered %d files in %d package(s)", _files.size(), _packages.size());

-	

+

 	delete stream;

 }

 

 PackageSet::~PackageSet() {

-	for (Common::Array<BasePackage*>::iterator it = _packages.begin(); it != _packages.end(); it++) {

+	for (Common::Array<BasePackage *>::iterator it = _packages.begin(); it != _packages.end(); it++) {

 		delete *it;

 	}

 	_packages.clear();

diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h
index b9a7bc5934..a562229f65 100644
--- a/engines/wintermute/base/file/base_package.h
+++ b/engines/wintermute/base/file/base_package.h
@@ -48,7 +48,7 @@ public:
 class PackageSet : public Common::Archive {

 public:

 	virtual ~PackageSet();

-	

+

 	PackageSet(Common::FSNode package, const Common::String &filename = "", bool searchSignature = false);

 	/**

 	 * Check if a member with the given name is present in the Archive.

@@ -64,12 +64,12 @@ public:
 	 * @return the number of names added to list

 	 */

 	virtual int listMembers(Common::ArchiveMemberList &list) const;

-	

+

 	/**

 	 * Returns a ArchiveMember representation of the given file.

 	 */

 	virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const;

-	

+

 	/**

 	 * Create a stream bound to a member with the specified name in the

 	 * archive. If no member with this name exists, 0 is returned.

diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp
index 73c06271d7..aac5436071 100644
--- a/engines/wintermute/base/file/base_resources.cpp
+++ b/engines/wintermute/base/file/base_resources.cpp
@@ -2816,7 +2816,7 @@ Common::SeekableReadStream *BaseResources::getFile(const Common::String &filenam
 	return NULL;

 }

 

-bool BaseResources::hasFile(const Common::String& filename) {

+bool BaseResources::hasFile(const Common::String &filename) {

 	if (scumm_stricmp(filename.c_str(), "invalid.bmp") == 0) {

 		return true;

 	} else if (scumm_stricmp(filename.c_str(), "invalid_debug.bmp") == 0) {

diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h
index 2959f9882f..2ccab6996f 100644
--- a/engines/wintermute/base/file/base_resources.h
+++ b/engines/wintermute/base/file/base_resources.h
@@ -37,7 +37,7 @@ namespace WinterMute {
 class BaseResources {

 public:

 	static Common::SeekableReadStream *getFile(const Common::String &filename);

-	static bool hasFile(const Common::String& filename);

+	static bool hasFile(const Common::String &filename);

 };

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h
index 5e47edba56..4a51683260 100644
--- a/engines/wintermute/base/file/dcpackage.h
+++ b/engines/wintermute/base/file/dcpackage.h
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License

  * as published by the Free Software Foundation; either version 2

  * of the License, or (at your option) any later version.

- 

+

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- 

+

  * You should have received a copy of the GNU General Public License

  * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index dd5d006556..0a97370cb7 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -646,8 +646,8 @@ bool BaseFontTT::initFont() {
 		AnsiString fontFileName = PathUtil::combine(BasePlatform::getSystemFontPath(), PathUtil::getFileName(_fontFile));

 		file = _gameRef->_fileManager->openFile(fontFileName.c_str(), false);

 		if (!file) {

-			_gameRef->LOG(0, "Error loading TrueType font '%s'", _fontFile);

-			//return STATUS_FAILED;

+		    _gameRef->LOG(0, "Error loading TrueType font '%s'", _fontFile);

+		    //return STATUS_FAILED;

 		}*/

 	}

 

diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 90a1e378ca..83b5ad0e16 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -74,7 +74,7 @@ public:
 	virtual void fade(uint16 alpha) = 0;

 	/**

 	 * Fade a portion of the screen to a specific color

-	 * 

+	 *

 	 * @param r the red component to fade too.

 	 * @param g the green component to fade too.

 	 * @param b the blue component to fade too.

@@ -93,7 +93,7 @@ public:
 	virtual bool windowedBlt();

 	/**

 	 * Fill a portion of the screen with a specified color

-	 * 

+	 *

 	 * @param r the red component to fill with.

 	 * @param g the green component to fill with.

 	 * @param b the blue component to fill with.

diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index cb98bde722..66a3460d48 100644
--- a/engines/wintermute/base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -86,7 +86,7 @@ protected:
 	byte _ckRed;

 	byte _ckGreen;

 	byte _ckBlue;

-	

+

 	bool _keepLoaded;

 	Common::String _filename;

 	int _height;

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 09ee62c3b8..43cf66d053 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -43,11 +43,11 @@ namespace WinterMute {
 RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY) : _owner(owner),

 	_srcRect(*srcRect), _dstRect(*dstRect), _drawNum(0), _isValid(true), _wantsDraw(true), _hasAlpha(true) {

 	_colorMod = 0;

-		_mirror = TransparentSurface::FLIP_NONE;

-		if (mirrorX)

-			_mirror |= TransparentSurface::FLIP_V;

-		if (mirrorY)

-			_mirror |= TransparentSurface::FLIP_H;

+	_mirror = TransparentSurface::FLIP_NONE;

+	if (mirrorX)

+		_mirror |= TransparentSurface::FLIP_V;

+	if (mirrorY)

+		_mirror |= TransparentSurface::FLIP_H;

 	if (surf) {

 		_surface = new Graphics::Surface();

 		_surface->create((uint16)srcRect->width(), (uint16)srcRect->height(), surf->format);

@@ -78,13 +78,13 @@ RenderTicket::~RenderTicket() {
 

 bool RenderTicket::operator==(RenderTicket &t) {

 	if ((t._srcRect != _srcRect) ||

-		(t._dstRect != _dstRect) ||

-		(t._mirror != _mirror) ||

-		(t._owner != _owner) ||

-		(t._hasAlpha != _hasAlpha) ||

-		(t._colorMod != _colorMod)) {

-			return false;

-		}

+	        (t._dstRect != _dstRect) ||

+	        (t._mirror != _mirror) ||

+	        (t._owner != _owner) ||

+	        (t._hasAlpha != _hasAlpha) ||

+	        (t._colorMod != _colorMod)) {

+		return false;

+	}

 	return true;

 }

 

@@ -137,22 +137,22 @@ bool BaseRenderOSystem::initRenderer(int width, int height, bool windowed) {
 

 

 	// find suitable resolution

-/*#ifdef __IPHONEOS__

-	_realWidth = 480;

-	_realHeight = 320;

-

-	int numModes = SDL_GetNumDisplayModes(0);

-	for (int i = 0; i < numModes; i++) {

-		SDL_DisplayMode mode;

-		SDL_GetDisplayMode(0, i, &mode);

-

-		if (mode.w > mode.h) {

-			_realWidth = mode.w;

-			_realHeight = mode.h;

-			break;

-		}

-	}

-#else*/

+	/*#ifdef __IPHONEOS__

+	    _realWidth = 480;

+	    _realHeight = 320;

+

+	    int numModes = SDL_GetNumDisplayModes(0);

+	    for (int i = 0; i < numModes; i++) {

+	        SDL_DisplayMode mode;

+	        SDL_GetDisplayMode(0, i, &mode);

+

+	        if (mode.w > mode.h) {

+	            _realWidth = mode.w;

+	            _realHeight = mode.h;

+	            break;

+	        }

+	    }

+	#else*/

 	_realWidth = _gameRef->_registry->readInt("Debug", "ForceResWidth", _width);

 	_realHeight = _gameRef->_registry->readInt("Debug", "ForceResHeight", _height);

 //#endif

@@ -257,7 +257,7 @@ bool BaseRenderOSystem::flip() {
 		if (_disableDirtyRects) {

 			g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, 0, 0, _renderSurface->w, _renderSurface->h);

 		}

-	//	g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, _dirtyRect->left, _dirtyRect->top, _dirtyRect->width(), _dirtyRect->height());

+		//  g_system->copyRectToScreen((byte *)_renderSurface->pixels, _renderSurface->pitch, _dirtyRect->left, _dirtyRect->top, _dirtyRect->width(), _dirtyRect->height());

 		delete _dirtyRect;

 		_dirtyRect = NULL;

 		g_system->updateScreen();

@@ -347,7 +347,7 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S
 	if (_disableDirtyRects) {

 		RenderTicket renderTicket(owner, surf, srcRect, dstRect, mirrorX, mirrorY);

 		// HINT: The surface-data contains other info than it should.

-	//	drawFromSurface(renderTicket._surface, srcRect, dstRect, NULL, mirrorX, mirrorY);

+		//  drawFromSurface(renderTicket._surface, srcRect, dstRect, NULL, mirrorX, mirrorY);

 		drawFromSurface(renderTicket.getSurface(), &renderTicket._srcRect, &renderTicket._dstRect, NULL, renderTicket._mirror);

 		return;

 	}

@@ -355,8 +355,8 @@ void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::S
 	if ((dstRect->left < 0 && dstRect->right < 0) || (dstRect->top < 0 && dstRect->bottom < 0)) {

 		return;

 	}

-	

-	RenderTicket compare(owner, NULL, srcRect, dstRect, mirrorX, mirrorY); 

+

+	RenderTicket compare(owner, NULL, srcRect, dstRect, mirrorX, mirrorY);

 	compare._colorMod = _colorMod;

 	RenderQueueIterator it;

 	for (it = _renderQueue.begin(); it != _renderQueue.end(); it++) {

@@ -397,14 +397,14 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
 			addDirtyRect(renderTicket->_dstRect);

 		} else {

 			// Before something

-			Common::List<RenderTicket*>::iterator pos;

+			Common::List<RenderTicket *>::iterator pos;

 			for (pos = _renderQueue.begin(); pos != _renderQueue.end(); pos++) {

 				if ((*pos)->_drawNum >= _drawNum) {

 					break;

 				}

 			}

 			_renderQueue.insert(pos, renderTicket);

-			Common::List<RenderTicket*>::iterator it;

+			Common::List<RenderTicket *>::iterator it;

 			renderTicket->_drawNum = _drawNum++;

 			// Increment the following tickets, so they still are in line

 			for (it = pos; it != _renderQueue.end(); it++) {

@@ -432,7 +432,7 @@ void BaseRenderOSystem::drawFromTicket(RenderTicket *renderTicket) {
 				// Decreement the following tickets.

 				for (; it != _renderQueue.end(); it++) {

 					(*it)->_drawNum--;

-				} 

+				}

 			}

 			// Is not in order, so readd it as if it was a new ticket

 			renderTicket->_drawNum = 0;

@@ -457,7 +457,7 @@ void BaseRenderOSystem::drawTickets() {
 	int decrement = 0;

 	while (it != _renderQueue.end()) {

 		if ((*it)->_wantsDraw == false || (*it)->_isValid == false) {

-			RenderTicket* ticket = *it;

+			RenderTicket *ticket = *it;

 			addDirtyRect((*it)->_dstRect);

 			//warning("Discarding Rect: %d %d %d %d Width: %d Height: %d", (*it)->_dstRect.left, (*it)->_dstRect.top, (*it)->_dstRect.right, (*it)->_dstRect.bottom, (*it)->_dstRect.width() , (*it)->_dstRect.height());

 			it = _renderQueue.erase(it);

@@ -474,7 +474,7 @@ void BaseRenderOSystem::drawTickets() {
 	// draw, we need to keep track of what it was prior to draw.

 	uint32 oldColorMod = _colorMod;

 //	warning("DirtyRect: %d %d %d %d Width: %d Height: %d", _dirtyRect->left, _dirtyRect->top, _dirtyRect->right, _dirtyRect->bottom, _dirtyRect->width(), _dirtyRect->height());

-	

+

 	// Apply the clear-color to the dirty rect.

 	_renderSurface->fillRect(*_dirtyRect, _clearColor);

 	_drawNum = 1;

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index b7507098da..0d00b1b427 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -102,9 +102,9 @@ private:
 	void addDirtyRect(const Common::Rect &rect);

 	void drawTickets();

 	void drawFromSurface(const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, Common::Rect *clipRect, uint32 mirror);

-	typedef Common::List<RenderTicket*>::iterator RenderQueueIterator;

+	typedef Common::List<RenderTicket *>::iterator RenderQueueIterator;

 	Common::Rect *_dirtyRect;

-	Common::List<RenderTicket*> _renderQueue;

+	Common::List<RenderTicket *> _renderQueue;

 	bool _needsFlip;

 	uint32 _drawNum;

 	Common::Rect _renderRect;

diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index c8cbe99f73..36213dfde1 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -190,7 +190,7 @@ bool BaseSurfaceOSystem::finishLoad() {
 	delete image;

 

 	_loaded = true;

-	

+

 	return true;

 }

 

@@ -529,7 +529,7 @@ bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAl
 	_hasAlpha = hasAlpha;

 	BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);

 	renderer->invalidateTicketsFromSurface(this);

-		

+

 	return STATUS_OK;

 }

 

diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index 198e415cc4..fc557a9512 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -72,57 +72,57 @@ public:
 private:

 	int _width;

 	int _height;

-	

+

 	int _angle1;

 	int _angle2;

-	

+

 	float _rotation1;

 	float _rotation2;

-	

+

 	float _angVelocity1;

 	float _angVelocity2;

-	

+

 	float _growthRate1;

 	float _growthRate2;

 	bool _exponentialGrowth;

-	

+

 	float _velocity1;

 	float _velocity2;

 	bool _velocityZBased;

-	

+

 	float _scale1;

 	float _scale2;

 	bool _scaleZBased;

-	

+

 	int _maxParticles;

-	

+

 	int _lifeTime1;

 	int _lifeTime2;

 	bool _lifeTimeZBased;

-	

+

 	int _genInterval;

 	int _genAmount;

-	

+

 	bool _running;

 	int _overheadTime;

-	

+

 	int _maxBatches;

 	int _batchesGenerated;

-	

+

 	Rect32 _border;

 	int _borderThicknessLeft;

 	int _borderThicknessRight;

 	int _borderThicknessTop;

 	int _borderThicknessBottom;

-	

+

 	int _fadeInTime;

-	

+

 	int _alpha1;

 	int _alpha2;

 	bool _alphaTimeBased;

-	

+

 	bool _useRegion;

-	

+

 	char *_emitEvent;

 	BaseScriptHolder *_owner;

 

diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index 1853d7abfd..8cc8c21948 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -229,7 +229,7 @@ bool BaseSound::setVolume(int volume) {
 

 //////////////////////////////////////////////////////////////////////////

 bool BaseSound::setPrivateVolume(int volume) {

-	if (!_sound) 

+	if (!_sound)

 		return STATUS_FAILED;

 	else return _sound->_privateVolume = volume;

 }

diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 27276f4fa7..f2db0a18fb 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -110,7 +110,7 @@ bool BaseSoundBuffer::loadFromFile(const char *filename, bool forceReload) {
 		int waveSize, waveRate;

 		byte waveFlags;

 		uint16 waveType;

-		

+

 		if (Audio::loadWAVFromStream(*_file, waveSize, waveRate, waveFlags, &waveType)) {

 			if (waveType == 1) {

 				// We need to wrap the file in a substream to make sure the size is right.

@@ -208,7 +208,7 @@ bool BaseSoundBuffer::play(bool looping, uint32 startSample) {
 		} else {

 			g_system->getMixer()->playStream(_type, _handle, _stream, -1, _volume, 0, DisposeAfterUse::NO);

 		}

-	} 

+	}

 

 	return STATUS_OK;

 }

diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index a73b20e404..cebc3a3765 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -80,7 +80,7 @@ void BaseSoundMgr::saveSettings() {
 //////////////////////////////////////////////////////////////////////////

 bool BaseSoundMgr::initialize() {

 	_soundAvailable = false;

-	

+

 	if (!g_system->getMixer()->isReady()) {

 		return STATUS_FAILED;

 	}