[Scummvm-cvs-logs] scummvm master -> 2bc174a3d05e39b415cdae951afff03b2ef3654b

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2bc174a3d0 MORTEVIELLE: Janitorial - Remove trailing spaces


Commit: 2bc174a3d05e39b415cdae951afff03b2ef3654b
    https://github.com/scummvm/scummvm/commit/2bc174a3d05e39b415cdae951afff03b2ef3654b
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-16T09:24:19-08:00

Commit Message:
MORTEVIELLE: Janitorial - Remove trailing spaces

Changed paths:
    engines/mortevielle/menu.cpp
    engines/mortevielle/module.mk
    engines/mortevielle/outtext.cpp
    engines/mortevielle/saveload.cpp
    engines/mortevielle/sound.cpp



diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 7979e3c..05d33a2 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -141,19 +141,19 @@ void Menu::readVerbNums(Common::File &f, int dataSize) {
 	_actionMenu[1]._actionId  = _opcodeSHide  & 0xFF;
 
 	_actionMenu[2]._menuId    = _opcodeAttach >> 8;
-	_actionMenu[2]._actionId  = _opcodeAttach & 0xFF; 
+	_actionMenu[2]._actionId  = _opcodeAttach & 0xFF;
 
 	_actionMenu[3]._menuId    = _opcodeForce  >> 8;
-	_actionMenu[3]._actionId  = _opcodeForce  & 0xFF; 
+	_actionMenu[3]._actionId  = _opcodeForce  & 0xFF;
 
 	_actionMenu[4]._menuId    = _opcodeSleep  >> 8;
 	_actionMenu[4]._actionId  = _opcodeSleep  & 0xFF;
 
 	_actionMenu[5]._menuId    = _opcodeEnter  >> 8;
-	_actionMenu[5]._actionId  = _opcodeEnter  & 0xFF; 
+	_actionMenu[5]._actionId  = _opcodeEnter  & 0xFF;
 
 	_actionMenu[6]._menuId    = _opcodeClose  >> 8;
-	_actionMenu[6]._actionId  = _opcodeClose  & 0xFF; 
+	_actionMenu[6]._actionId  = _opcodeClose  & 0xFF;
 
 	_actionMenu[7]._menuId    = _opcodeKnock  >> 8;
 	_actionMenu[7]._actionId  = _opcodeKnock  & 0xFF;
@@ -612,7 +612,7 @@ void Menu::updateMenu() {
 
 void Menu::initMenu() {
 	Common::File f;
-	
+
 	bool menuLoaded = false;
 	// First try to read it from mort.dat if useOriginalData() is false
 	if (!_vm->useOriginalData()) {
@@ -636,7 +636,7 @@ void Menu::initMenu() {
 				desiredLanguageId = MORTDAT_LANG_ENGLISH;
 				break;
 			}
-		
+
 			// Validate the data file header
 			char fileId[4];
 			f.read(fileId, 4);
@@ -654,7 +654,7 @@ void Menu::initMenu() {
 						// Read in the language
 						byte languageId = f.readByte();
 						--dataSize;
-					
+
 						// If the language isn't correct, then skip the entire block
 						if (languageId != desiredLanguageId) {
 							f.skip(dataSize);
diff --git a/engines/mortevielle/module.mk b/engines/mortevielle/module.mk
index a9f02c2..7188e36 100644
--- a/engines/mortevielle/module.mk
+++ b/engines/mortevielle/module.mk
@@ -19,5 +19,5 @@ ifeq ($(ENABLE_MORTEVIELLE), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 
-# Include common rules 
+# Include common rules
 include $(srcdir)/rules.mk
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index b359860..850186d 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -287,8 +287,8 @@ void TextHandler::taffich() {
 			filename = "AXX.mor";
 		} else { // b == 50
 			// CHECKME: the size of AZZ.mor is 1280 for the DOS version
-			//          and 1260 for the Amiga version. Maybe the 20 bytes 
-			//          are a filler (to get 10 blocks of 128 bytes), 
+			//          and 1260 for the Amiga version. Maybe the 20 bytes
+			//          are a filler (to get 10 blocks of 128 bytes),
 			//          or the size should be variable.
 			drawingSize = 1260;
 			filename = "AZZ.mor";
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index 77a9a63..42cd7cc 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -125,7 +125,7 @@ Common::Error SavegameManager::loadGame(const Common::String &filename) {
 		g_vm->gameLoaded();
 		g_vm->_mouse->showMouse();
 		return Common::kNoError;
-	} else 
+	} else
 		return Common::kUnknownError;
 }
 
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 1270eeb..8cd4e62 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -203,7 +203,7 @@ void SoundManager::litph(tablint &t, int typ, int tempo) {
 				}
 			} else { // 2
 				debugC(5, kMortevielleSounds, "litph - vadson");
-				const static int ambiantNoiseAdr[] = {0,     14020, 
+				const static int ambiantNoiseAdr[] = {0,     14020,
 													  14020, 18994,
 													  18994, 19630,
 													  19630, 22258,
@@ -695,7 +695,7 @@ void SoundManager::handlePhoneme() {
 	uint16 startPos = _cfiphBuffer[_phonemeNumb - 1] + deca[_soundType];
 	uint16 endPos = _cfiphBuffer[_phonemeNumb] + deca[_soundType];
 	int wordCount = endPos - startPos;
-	
+
 	startPos /= 2;
 	endPos /= 2;
 	assert((endPos - startPos) < 1711);