JANITORIAL: Remove trailing spaces

8 files changed, 26 insertions, 26 deletions

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index b3e7926015..f09729a1ed 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -99,7 +99,7 @@ static const byte v0ActorTalk[25] = {
 	0x06, // Sandy (Cut-Scene)
 };
 
-static const byte v0WalkboxSlantedModifier[0x16] = { 
+static const byte v0WalkboxSlantedModifier[0x16] = {
 	0x00,0x01,0x02,0x03,0x03,0x04,0x05,0x06,
 	0x06,0x07,0x08,0x09,0x09,0x0A,0x0B,
 	0x0C,0x0C,0x0D,0x0E,0x0F,0x10,0x10
@@ -237,7 +237,7 @@ void Actor_v0::initActor(int mode) {
 	_costCommand = 0xFF;
 	_miscflags = 0;
 	_speaking = 0;
-	
+
 	_walkCountModulo = 0;
 	_newWalkBoxEntered = false;
 	_walkDirX = 0;
@@ -297,7 +297,7 @@ void Actor_v0::walkboxQueueReverse() {
 		return;
 
 	for (int i = 1; i < j && j >= 1 ; ++i, --j) {
-		
+
 		byte tmp = _walkboxQueue[i];
 
 		_walkboxQueue[i] = _walkboxQueue[j];
@@ -371,7 +371,7 @@ bool Actor_v0::walkBoxQueuePrepare() {
 			_walkboxQueue[--_walkboxQueueIndex] = kInvalidBox;
 
 			BoxFound = _walkboxQueue[_walkboxQueueIndex - 1];
-		} 
+		}
 
 	} while (_walkboxQueueIndex > 0);
 
@@ -616,7 +616,7 @@ bool Actor_v0::calcWalkDistances() {
 	if (!_walkXCountInc && !_walkYCountInc)
 		return true;
 
-	if (_walkXCountInc <= _walkYCountInc) 
+	if (_walkXCountInc <= _walkYCountInc)
 		_walkYCountGreaterThanXCount = 1;
 
 	// 2FCC
@@ -652,7 +652,7 @@ byte Actor_v0::actorWalkX() {
 		setActorFromTmp();
 
 		return 3;
-	} 
+	}
 	// 2EBF
 	if (_tmp_Dest.x == _CurrentWalkTo.x)
 		return 1;
@@ -679,7 +679,7 @@ byte Actor_v0::actorWalkY() {
 		// 2EF8
 		setActorFromTmp();
 		return 4;
-	} 
+	}
 	// 2EFE
 	if (_walkYCountInc != 0) {
 		if (_walkYCountInc == 0xFF) {
@@ -690,7 +690,7 @@ byte Actor_v0::actorWalkY() {
 	// 2F0D
 	if (_CurrentWalkTo.y == _tmp_Dest.y)
 		return 1;
-	
+
 	return 0;
 }
 
@@ -904,8 +904,8 @@ L2A33:;
 		}
 
 		directionUpdate();
-		
-		if (_moving & 0x80) 
+
+		if (_moving & 0x80)
 			return;
 
 		animateActor(newDirToOldDir(_facing));
@@ -913,7 +913,7 @@ L2A33:;
 	} else {
 		// 2A0A
 		if ((_moving & 0x7F) != 1) {
-			
+
 			if (_NewWalkTo == _pos)
 				return;
 		}
@@ -1025,7 +1025,7 @@ L2CA3:;
 				_moving &= 0xF0;
 				_moving |= A;
 			} else {
-				if (A == 4) 
+				if (A == 4)
 					stopActorMoving();
 			}
 
@@ -1061,7 +1061,7 @@ L2CA3:;
 				} else {
 					_targetFacing = getAngleFromPos(V12_X_MULTIPLIER*-1, V12_Y_MULTIPLIER*0, false);
 				}
-				
+
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
 				goto L2CA3;
@@ -1433,13 +1433,13 @@ void Actor::turnToDirection(int newdir) {
 
 	if (_vm->_game.version <= 6) {
 		_targetFacing = newdir;
-		
+
 		if (_vm->_game.version == 0) {
 			setDirection(newdir);
 			return;
 		}
 		_moving = MF_TURN;
-		
+
 	} else {
 		_moving &= ~MF_TURN;
 		if (newdir != _facing) {
@@ -1637,7 +1637,7 @@ AdjustBoxResult Actor_v0::adjustPosInBorderWalkbox(AdjustBoxResult box) {
 
 	int16 A;
 	boxMask &= 0x7C;
-	if (boxMask == 0x0C) 
+	if (boxMask == 0x0C)
 		A = 2;
 	else {
 		if (boxMask != 0x08)
@@ -2114,7 +2114,7 @@ void ScummEngine::processActors() {
 		// comment further up in this method for some details.
 		if (a->_costume) {
 
-			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)... 
+			// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)...
 			// doing it the other way with V0, causes animation glitches (when beginnning to walk, as the costume hasnt been updated).
 			// Updating the costume directly after 'walkActor' and again, after drawing... causes frame skipping
 			if (_game.version == 0) {
@@ -3476,7 +3476,7 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 
 		// valid costume command?
 		if (_costCommand != 0xFF) {
-			
+
 			// Do we have a walkbox queue?
 			if (_walkboxQueueIndex < 1) {
 				_costCommand = 0xFF;
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 96b46aa21a..139f798d83 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -262,7 +262,7 @@ ScummDiskImage::ScummDiskImage(const char *disk1, const char *disk2, GameSetting
 		_numGlobalObjects = 256;
 		_numRooms = 55;
 		_numCostumes = 25;
-		
+
 		if (_game.features & GF_DEMO) {
 			_numScripts = 55;
 			_numSounds = 40;
diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp
index c504ad4fe8..8e4b5c9cc7 100644
--- a/engines/scumm/he/logic/moonbase_logic.cpp
+++ b/engines/scumm/he/logic/moonbase_logic.cpp
@@ -446,7 +446,7 @@ int LogicHEmoonbase::op_net_get_session_player_count(int op, int numArgs, int32
 	return _vm1->_moonbase->_net->getSessionPlayerCount(args[0] - 1);
 }
 
-int LogicHEmoonbase::op_net_destroy_player(int op, int numArgs, int32 *args) {	
+int LogicHEmoonbase::op_net_destroy_player(int op, int numArgs, int32 *args) {
 	return _vm1->_moonbase->_net->destroyPlayer(args[0]);
 }
 
@@ -506,7 +506,7 @@ int LogicHEmoonbase::op_net_who_am_i(int op, int numArgs, int32 *args) {
 }
 
 int LogicHEmoonbase::op_net_set_provider_by_name(int op, int numArgs, int32 *args) {
-	// Parameter 1 is the provider name and 
+	// Parameter 1 is the provider name and
 	// Parameter 2 is the (optional) tcp/ip address
 	return _vm1->_moonbase->_net->setProviderByName(args[0], args[1]);
 }
diff --git a/engines/scumm/he/moonbase/net_main.h b/engines/scumm/he/moonbase/net_main.h
index 8350904fcd..dd8cce5937 100644
--- a/engines/scumm/he/moonbase/net_main.h
+++ b/engines/scumm/he/moonbase/net_main.h
@@ -72,7 +72,7 @@ public:
 	void getSessionName(int sessionNumber, char *buffer, int length);
 	int getSessionPlayerCount(int sessionNumber);
 	void getProviderName(int providerIndex, char *buffer, int length);
-	
+
 private:
 	//mostly getters
 
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index a922af1671..b2af816afe 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -1506,7 +1506,7 @@ void ScummEngine_v72he::getStringFromArray(int arrayNumber, char *buffer, int ma
 	// this is ARRAY_GetStringFromArray() from ARRAYS.cpp of SPUTM
 
 	// this function makes a C-string out of <arrayNumber> contents
-	
+
 	VAR(0) = arrayNumber; // it was 0 in original code, but I've seen ScummVM Moonbase code which uses VAR_U32_ARRAY_UNK
 
 	int i, ch;
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index 87dc132ff0..2e37e4de76 100644
--- a/engines/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
@@ -39,7 +39,7 @@ void ScummEngine_v2::readClassicIndexFile() {
 				_numSounds = 40;
 			} else {
 				_numScripts = 160;
-				_numSounds = 70; 
+				_numSounds = 70;
 			}
 
 		} else if (_game.platform == Common::kPlatformNES) {
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 609cbd1e89..7bacd847ac 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -641,7 +641,7 @@ void ScummEngine_v0::setMode(byte mode) {
 		// Note: do not change freeze state here
 		state = USERSTATE_SET_IFACE |
 			USERSTATE_SET_CURSOR;
-		
+
 		break;
 	case kModeKeypad:
 		if (_game.features & GF_DEMO) {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index fe936b550c..8bcbb70e97 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -905,7 +905,7 @@ void ScummEngine_v0::checkExecVerbs() {
 			}
 		}
 	}
-		
+
 	if (_drawDemo && _game.features & GF_DEMO) {
 		verbDemoMode();
 	}