Whoa! Removing trailing spaces.

svn-id: r35648

13 files changed, 40 insertions, 40 deletions

diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index a0f998e02f..11ea4ea25c 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -585,7 +585,7 @@ int loadAni(const char *resourceName, int16 idx) {
 
 	transparentColor = getAnimTransparentColor(resourceName);
 
-	// TODO: Merge this special case hack into getAnimTransparentColor somehow.	
+	// TODO: Merge this special case hack into getAnimTransparentColor somehow.
 	// HACK: Versions of TITRE.ANI with height 37 use color 0xF for transparency.
 	//       Versions of TITRE.ANI with height 57 use color 0x0 for transparency.
 	//       Fixes bug #2057619: FW: Glitches in title display of demo (regression).
diff --git a/engines/cine/bg_list.cpp b/engines/cine/bg_list.cpp
index fddca078e5..8a79bfeea1 100644
--- a/engines/cine/bg_list.cpp
+++ b/engines/cine/bg_list.cpp
@@ -98,7 +98,7 @@ void loadBgIncrustFromSave(Common::SeekableReadStream &fHandle) {
 		tmp.y = fHandle.readUint16BE();
 		tmp.frame = fHandle.readUint16BE();
 		tmp.part = fHandle.readUint16BE();
-	
+
 		bgIncrustList.push_back(tmp);
 
 		if (tmp.param == 0) {
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 3a2954f7d6..13991f0dec 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -98,7 +98,7 @@ Common::Error CineEngine::go() {
 	delete renderer;
 	delete[] collisionPage;
 	delete g_sound;
-	
+
 	return Common::kNoError;
 }
 
@@ -130,7 +130,7 @@ void CineEngine::initialize() {
 	Common::set_to(zoneData.begin(), zoneData.end(), 0);
 
 	// Resize zone query table to its correct size and reset all its elements
-	zoneQuery.resize(NUM_MAX_ZONE);	
+	zoneQuery.resize(NUM_MAX_ZONE);
 	Common::set_to(zoneQuery.begin(), zoneQuery.end(), 0);
 
 	_timerDelayMultiplier = 12; // Set default speed
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 7b4e34c645..d7351879ba 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -589,7 +589,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
 				if (pos < (sizeof(saveDesc) - 1)) {
 					if (ch < 32 || in->eos()) {
 						saveDesc[pos++] = '\0';
-					} 
+					}
 					else if (ch >= 32) {
 						saveDesc[pos++] = ch;
 					}
@@ -697,11 +697,11 @@ Common::Error CineEngine::saveGameState(int slot, const char *desc) {
 	return Common::kNoError;
 }
 
-bool CineEngine::canLoadGameStateCurrently() { 
+bool CineEngine::canLoadGameStateCurrently() {
 	return (!disableSystemMenu && !inMenu);
 }
 
-bool CineEngine::canSaveGameStateCurrently() { 
+bool CineEngine::canSaveGameStateCurrently() {
 	return (allowPlayerInput && !disableSystemMenu && !inMenu);
 }
 
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index e743d4227c..d388a9e206 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -329,7 +329,7 @@ void FWRenderer::drawPlainBox(int x, int y, int width, int height, byte color) {
 	Common::Rect screenRect(320, 200);
 	boxRect.clip(screenRect);
 
-	// Draw the filled rectangle	
+	// Draw the filled rectangle
 	byte *dest = _backBuffer + boxRect.top * 320 + boxRect.left;
 	for (int i = 0; i < boxRect.height(); i++) {
 		memset(dest + i * 320, color, boxRect.width());
@@ -1092,7 +1092,7 @@ void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 		}
 
 		_messageLen += messageTable[it->objIdx].size();
-		drawMessage(messageTable[it->objIdx].c_str(), it->x, it->y, it->width, it->color);		
+		drawMessage(messageTable[it->objIdx].c_str(), it->x, it->y, it->width, it->color);
 		if (it->color >= 0) { // This test isn't in Future Wars's implementation
 			waitForPlayerClick = 1;
 		}
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index e88340479f..c6bca84e46 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -265,7 +265,7 @@ void CineEngine::mainLoop(int bootScriptIdx) {
 
 		errorVar = 0;
 
-		addScriptToGlobalScripts(bootScriptIdx);	
+		addScriptToGlobalScripts(bootScriptIdx);
 
 		menuVar = 0;
 
@@ -337,7 +337,7 @@ void CineEngine::mainLoop(int bootScriptIdx) {
 
 		stopMusicAfterFadeOut();
 		di = executePlayerInput();
-		
+
 		// Clear the zoneQuery table (Operation Stealth specific)
 		if (g_cine->getGameType() == Cine::GType_OS) {
 			Common::set_to(zoneQuery.begin(), zoneQuery.end(), 0);
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index c826db3bf3..08b16524fd 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -57,7 +57,7 @@ void loadMsg(char *pMsgName) {
 		// buffer (e.g. message indexes 58-254 in BATEAU.MSG in PROCS08 in Operation Stealth).
 		if (messageDataPos < sourceSize) {
 			messageTable.push_back((const char *)(dataPtr + messageDataPos));
-		} else {			
+		} else {
 			if (messageLen > 0) { // Only warn about overflowing non-empty strings
 				warning("loadMsg(%s): message (%d. / %d) is overflowing the input buffer. Replacing it with an empty string", pMsgName, i + 1, count);
 			} else {
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index c06f39fe03..78fea6b861 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -44,7 +44,7 @@ void loadPal(const char *fileName) {
 	if (!palFileHandle.open(buffer))
 		error("loadPal(): Cannot open file %s", fileName);
 
-	uint16 palEntriesCount = palFileHandle.readUint16LE();	
+	uint16 palEntriesCount = palFileHandle.readUint16LE();
 	palFileHandle.readUint16LE(); // entry size
 
 	palArray.resize(palEntriesCount);
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index 7679d9d380..2cf9a52569 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -80,7 +80,7 @@ static Common::String fixVolCnfFileName(const uint8 *src, uint len) {
 		// so that's why we have to convert them first. There's no trailing zero in them
 		// either and they're always of the full length 11 with padding spaces. Extension
 		// can be always found at offset 8 onwards.
-		// 
+		//
 		// Examples of filename mappings:
 		// "AEROPORTMSG" -> "AEROPORT.MSG"
 		// "MITRAILLHP " -> "MITRAILL.HP" (Notice the trailing space after the extension)
@@ -160,7 +160,7 @@ void CineEngine::readVolCnf() {
 	// US Amiga release. It uses a compressed 'vol.cnf' file but still uses
 	// file names of length 13. So we try to deduce the file name length from
 	// the data in the 'vol.cnf' file.
-	int fileNameLength; 
+	int fileNameLength;
 	if (fileNameLenMod11 != fileNameLenMod13) {
 		// All file name blocks' sizes were divisible by either 11 or 13, but not with both.
 		fileNameLength = (fileNameLenMod11 ? 11 : 13);
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 75581565e2..2917ad6d1b 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -103,7 +103,7 @@ enum CineSaveGameFormat detectSaveGameFormat(Common::SeekableReadStream &fHandle
 			overlayEntrySize,
 			bgIncrustEntrySize
 		};
-		
+
 		uint animEntrySize = animEntrySizeChoices[i];
 		// Jump over the animDataTable entries and the screen parameters
 		int32 newPos = animDataTableStart + animEntrySize * animEntriesCount + sizeofScreenParams;
@@ -128,7 +128,7 @@ enum CineSaveGameFormat detectSaveGameFormat(Common::SeekableReadStream &fHandle
 			}
 			fHandle.seek(newPos);
 		}
-		
+
 		// If we could walk the chain successfully and
 		// got exactly to the end of file then we've got a match.
 		if (chainWalkSuccess && fHandle.pos() == fHandle.size()) {
@@ -145,7 +145,7 @@ enum CineSaveGameFormat detectSaveGameFormat(Common::SeekableReadStream &fHandle
 		assert(animEntrySize == oldAnimEntrySize || animEntrySize == newAnimEntrySize);
 		if (animEntrySize == oldAnimEntrySize) {
 			result = ANIMSIZE_23;
-		} else { // animEntrySize == newAnimEntrySize		
+		} else { // animEntrySize == newAnimEntrySize
 			// Check data and mask pointers in all of the animDataTable entries
 			// to see whether we've got the version with the broken data and mask pointers or not.
 			// In the broken format all data and mask pointers were always zero.
@@ -484,7 +484,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 		return false;
 	} else if (hdr.version > CURRENT_OS_SAVE_VER) {
 		warning("loadTempSaveOS: Detected newer format version. Not loading savegame");
-		return false;		
+		return false;
 	} else if ((int)hdr.version < (int)CURRENT_OS_SAVE_VER) {
 		warning("loadTempSaveOS: Detected older format version. Trying to load nonetheless. Things may break");
 	} else { // hdr.id == TEMP_OS_FORMAT_ID && hdr.version == CURRENT_OS_SAVE_VER
@@ -499,7 +499,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 
 	// Ok, so we've got a correct header for a temporary Operation Stealth savegame.
 	// Let's start loading the plain savegame data then.
-	currentDisk = in.readUint16BE();	
+	currentDisk = in.readUint16BE();
 	in.read(currentPartName, 13);
 	in.read(currentPrcName, 13);
 	in.read(currentRelName, 13);
@@ -509,7 +509,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 	for (uint i = 0; i < 8; i++) {
 		in.read(bgNames[i], 13);
 	}
-	
+
 	in.read(currentCtName, 13);
 
 	// Moved the loading of current procedure, relation,
@@ -571,7 +571,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 	// TODO: Use the loaded value (Is music playing? (Uint16BE, Boolean)).
 	in.readUint16BE();
 
-	renderer->_cmdY      = in.readUint16BE();	
+	renderer->_cmdY      = in.readUint16BE();
 	in.readUint16BE(); // Some unknown variable that seems to always be zero
 	allowPlayerInput     = in.readUint16BE();
 	playerCommand        = in.readUint16BE();
@@ -583,7 +583,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 	var2                 = in.readUint16BE();
 	commandVar2          = in.readUint16BE();
 	renderer->_messageBg = in.readUint16BE();
-	
+
 	// TODO: Use the loaded value (adBgVar1 (Uint16BE)).
 	in.readUint16BE();
 
@@ -625,7 +625,7 @@ bool CineEngine::loadTempSaveOS(Common::SeekableReadStream &in) {
 	// TODO: Palette handling?
 
 	if (in.pos() == in.size()) {
-		debug(3, "loadTempSaveOS: Loaded the whole savefile.");		
+		debug(3, "loadTempSaveOS: Loaded the whole savefile.");
 	} else {
 		warning("loadTempSaveOS: Loaded the savefile but didn't exhaust it completely. Something was left over");
 	}
@@ -784,7 +784,7 @@ bool CineEngine::makeLoad(char *saveName) {
 		// 0x2315 + (255 * 30) + (2 * 6) + (206 + 206 + 20 + 20) * 512 = ~242kB
 		//
 		// I think it extremely unlikely that there would be over 512 global scripts, object scripts,
-		// overlays and background incrusts so 256kB seems like quite a safe upper limit.		
+		// overlays and background incrusts so 256kB seems like quite a safe upper limit.
 		// NOTE: If the savegame format is changed then this value might have to be re-evaluated!
 		// Hopefully devices with more limited memory can also cope with this memory allocation.
 		saveSize = 256 * 1024;
@@ -815,7 +815,7 @@ bool CineEngine::makeLoad(char *saveName) {
 	if (load) {
 		// Reset the engine's state
 		resetEngine();
-		
+
 		if (saveGameFormat == TEMP_OS_FORMAT) {
 			// Load the temporary Operation Stealth savegame format
 			result = loadTempSaveOS(*in);
@@ -882,7 +882,7 @@ void CineEngine::makeSaveFW(Common::OutSaveFile &out) {
 void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
 	int i;
 
-	// Make a temporary Operation Stealth savegame format chunk header and save it.	
+	// Make a temporary Operation Stealth savegame format chunk header and save it.
 	ChunkHeader header;
 	header.id = TEMP_OS_FORMAT_ID;
 	header.version = CURRENT_OS_SAVE_VER;
@@ -918,7 +918,7 @@ void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
 	// 0x2934: Is music playing? (Uint16BE, Boolean).
 	out.writeUint16BE(0);
 
-	out.writeUint16BE(renderer->_cmdY);	
+	out.writeUint16BE(renderer->_cmdY);
 	out.writeUint16BE(0); // Some unknown variable that seems to always be zero
 	out.writeUint16BE(allowPlayerInput);
 	out.writeUint16BE(playerCommand);
@@ -930,7 +930,7 @@ void CineEngine::makeSaveOS(Common::OutSaveFile &out) {
 	out.writeUint16BE(var2);
 	out.writeUint16BE(commandVar2);
 	out.writeUint16BE(renderer->_messageBg);
-	
+
 	// FIXME: Save proper value for this variable, currently writing zero.
 	// An unknown variable at 0x295E: adBgVar1 (Uint16BE).
 	out.writeUint16BE(0);
diff --git a/engines/cine/script_os.cpp b/engines/cine/script_os.cpp
index e8f16ebfcc..792e75b42f 100644
--- a/engines/cine/script_os.cpp
+++ b/engines/cine/script_os.cpp
@@ -459,7 +459,7 @@ int FWScript::o2_modifySeqListElement() {
 	byte e = getNextByte();
 	debugC(5, kCineDebugScript, "Line: %d: o2_modifySeqListElement(%d,%d,%d,%d,%d)", _line, a, b, c, d, e);
 
-	modifySeqListElement(a, 0, b, c, d, e);	
+	modifySeqListElement(a, 0, b, c, d, e);
 	return 0;
 }
 
diff --git a/engines/cine/unpack.h b/engines/cine/unpack.h
index 2355df5ee1..96d6d20158 100644
--- a/engines/cine/unpack.h
+++ b/engines/cine/unpack.h
@@ -76,7 +76,7 @@ private:
 	/**
 	 * Get bits from the source stream.
 	 * @note Changes the bit position in the source stream.
-	 * @param numBits Number of bits to read from the source stream.	 
+	 * @param numBits Number of bits to read from the source stream.
 	 * @return Integer value consisting of the bits read from the source stream (In range [0, (2 ** numBits) - 1]).
 	 * @return Later the bit was read from the source, the less significant it is in the return value.
 	 */
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 3a826fab97..5b54bccc25 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -318,7 +318,7 @@ void CineEngine::resetEngine() {
 		currentAdditionalBgIdx2 = 0;
 		// TODO: Add resetting of the following variables
 		// adBgVar1 = 0;
-		// adBgVar0 = 0;		
+		// adBgVar0 = 0;
 		// gfxFadeOutCompleted = 0;
 	}
 }
@@ -602,7 +602,7 @@ void makeCommandLine(void) {
 			}
 		}
 	}
-	
+
 	if (g_cine->getGameType() == Cine::GType_OS || !(playerCommand != -1 && choiceResultTable[playerCommand] == 2)) {
 		if (playerCommand == 2) {
 			getMouseData(mouseUpdateStatus, &dummyU16, &x, &y);
@@ -829,7 +829,7 @@ uint16 executePlayerInput(void) {
 			renderer->setCommand(commandBuffer);
 			isDrawCommandEnabled = 0;
 		}
-		
+
 		getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
 
 		while (mouseButton && currentEntry < 200) {
@@ -870,7 +870,7 @@ uint16 executePlayerInput(void) {
 
 						commandBuffer += " ";
 						commandBuffer += objectTable[si].name;
-						
+
 
 						isDrawCommandEnabled = 1;
 
@@ -1408,14 +1408,14 @@ uint16 addAni(uint16 param1, uint16 objIdx, const int8 *ptr, SeqListElement &ele
 	return 1;
 }
 
-/*! 
+/*!
  * Permutates the overlay list into a different order according to some logic.
  * \todo Check this function for correctness (Wasn't very easy to reverse engineer so there may be errors)
  */
 void resetGfxEntityEntry(uint16 objIdx) {
 	Common::List<overlay>::iterator it, bObjsCutPoint;
 	Common::List<overlay> aReverseObjs, bObjs;
-	bool foundCutPoint = false;	
+	bool foundCutPoint = false;
 
 	// Go through the overlay list and partition the whole list into two categories (Type A and type B objects)
 	for (it = overlayList.begin(); it != overlayList.end(); ++it) {
@@ -1429,14 +1429,14 @@ void resetGfxEntityEntry(uint16 objIdx) {
 			} else {
 				objectMask = objectTable[it->objIdx].mask;
 			}
-	
+
 			if (objectTable[objIdx].mask > objectMask) { // Check for B objects' cut point
 				bObjsCutPoint = bObjs.reverse_begin();
 				foundCutPoint = true;
 			}
 		}
 	}
-	
+
 	// Recreate the overlay list in a different order.
 	overlayList.clear();
 	if (foundCutPoint) {
@@ -1461,7 +1461,7 @@ void processSeqListElement(SeqListElement &element) {
 	int16 var_10;
 	int16 var_4;
 	int16 var_2;
-	
+
 	// Initial interpretations for variables addressed through ptr1 (8-bit addressing):
 	// These may be inaccurate!
 	// 0: ?