PEGASUS: Remove trailing whitespaces.

Powered by: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'

14 files changed, 94 insertions, 94 deletions

diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
index 13dc6dfc77..d04b3d08b2 100644
--- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
+++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
@@ -65,7 +65,7 @@ void GravitonCannon::cleanUpShuttleWeapon() {
 	ShuttleWeapon::cleanUpShuttleWeapon();
 }
 
-void GravitonCannon::draw(const Common::Rect &) {	
+void GravitonCannon::draw(const Common::Rect &) {
 	// Left graviton...
 	Point3D pt3D = _weaponLocation;
 	pt3D.translate(-kGravitonWidth / 2, kGravitonHeight / 2, 0);
@@ -74,21 +74,21 @@ void GravitonCannon::draw(const Common::Rect &) {
 	Common::Rect gravitonRect;
 	gravitonRect.left = pt2D.x;
 	gravitonRect.top = pt2D.y;
-	
+
 	pt3D.translate(kGravitonWidth, -kGravitonHeight, 0);
 	project3DTo2D(pt3D, pt2D);
 	gravitonRect.right = pt2D.x;
 	gravitonRect.bottom = pt2D.y;
 
 	_gravitonImage.scaleTransparentCopy(_gravitonBounds, gravitonRect);
-	
+
 	// Right graviton...
 	pt3D = _rightLocation;
 	pt3D.translate(-kGravitonWidth / 2, kGravitonHeight / 2, 0);
 	project3DTo2D(pt3D, pt2D);
 	gravitonRect.left = pt2D.x;
 	gravitonRect.top = pt2D.y;
-	
+
 	pt3D.translate(kGravitonWidth, -kGravitonHeight, 0);
 	project3DTo2D(pt3D, pt2D);
 	gravitonRect.right = pt2D.x;
@@ -103,7 +103,7 @@ void GravitonCannon::updateWeaponPosition() {
 		linearInterp(_rightOrigin, _weaponTarget, _weaponTime, _rightLocation);
 }
 
-bool GravitonCannon::collisionWithJunk(Common::Point &impactPoint) {	
+bool GravitonCannon::collisionWithJunk(Common::Point &impactPoint) {
 	if (getDisplayOrder() == kShuttleWeaponFrontOrder) {
 		Point3D junkPosition;
 		g_spaceJunk->getJunkPosition(junkPosition);
diff --git a/engines/pegasus/neighborhood/mars/hermite.cpp b/engines/pegasus/neighborhood/mars/hermite.cpp
index dc4a2c5fc2..7f631b369d 100644
--- a/engines/pegasus/neighborhood/mars/hermite.cpp
+++ b/engines/pegasus/neighborhood/mars/hermite.cpp
@@ -27,7 +27,7 @@
 
 namespace Pegasus {
 
-CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {	
+CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {
 	float t = (float)time / duration;
 	float tsq = t * t;
 	float tcu = t * tsq;
@@ -37,7 +37,7 @@ CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32
 	return (CoordType)((tcu2 - tsq3 + 1) * p1 + (tsq3 - tcu2) * p4 + (tcu - tsq2 + t) * r1 + (tcu - tsq) * r4);
 }
 
-CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {	
+CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {
 	float t = (float)time / duration;
 	float t2 = t + t;
 	float t4 = t2 + t2;
@@ -48,7 +48,7 @@ CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32
 	return (CoordType)((tsq6 - t6) * p1 + (t6 - tsq6) * p4 + (tsq3 - t4 + 1) * r1 + (tsq3 - t2) * r4);
 }
 
-void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) {	
+void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) {
 	float t = (float)time / duration;
 	float tsq = t * t;
 	float tcu = t * tsq;
@@ -60,7 +60,7 @@ void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point
 	result.y = (int16)((tcu2 - tsq3 + 1) * p1.y + (tsq3 - tcu2) * p4.y + (tcu - tsq2 + t) * r1.y + (tcu - tsq) * r4.y);
 }
 
-void dHermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) {	
+void dHermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) {
 	float t = (float)time / duration;
 	float t2 = t + t;
 	float t4 = t2 + t2;
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index ec502d2fc9..8510abc92c 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -115,13 +115,13 @@ Mars::~Mars() {
 	_vm->getAllHotspots().remove(&_shuttleTransportSpot);
 }
 
-void Mars::init() {	
+void Mars::init() {
 	Neighborhood::init();
-	
+
 	Hotspot *attackSpot = _vm->getAllHotspots().findHotspotByID(kAttackRobotHotSpotID);
 	attackSpot->setMaskedHotspotFlags(kDropItemSpotFlag, kDropItemSpotFlag);
 	_attackingItem = NULL;
-	
+
 	forceStridingStop(kMars08, kNorth, kAltMarsNormal);
 
 	_neighborhoodNotification.notifyMe(this, kMarsNotificationFlags, kMarsNotificationFlags);
@@ -145,7 +145,7 @@ void Mars::start() {
 class AirMaskCondition : public AICondition {
 public:
 	AirMaskCondition(const uint32);
-	
+
 	virtual bool fireCondition();
 
 protected:
@@ -166,7 +166,7 @@ bool AirMaskCondition::fireCondition() {
 	return result;
 }
 
-void Mars::setUpAIRules() {	
+void Mars::setUpAIRules() {
 	Neighborhood::setUpAIRules();
 
 	// Don't add these rules if we're going to the robot's shuttle...
@@ -905,7 +905,7 @@ void Mars::loadAmbientLoops() {
 	} else if (room == kMarsRobotShuttle) {
 		loadLoopSound1("Sounds/Mars/Robot Shuttle.22K.8.AIFF");
 	}
-	
+
 	if (!_noAirFuse.isFuseLit()) {
 		switch (room) {
 		case kMars02:
@@ -1498,7 +1498,7 @@ void Mars::turnTo(const DirectionConstant direction) {
 	case MakeRoomView(kMars35, kWest):
 		if (!GameState.getMarsAirlockOpen())
 			setCurrentActivation(kActivateReadyToPressurizeAirlock);
-		
+
 		// Do this here because this will be called after spinning the airlock after
 		// going through the gear room.
 		if (GameState.getMarsThreadedMaze())
@@ -1920,7 +1920,7 @@ void Mars::pickedUpItem(Item *item) {
 	case kOpticalBiochip:
 		g_opticalChip->addAries();
 		GameState.setScoringGotMarsOpMemChip();
-			
+
 		if (_privateFlags.getFlag(kMarsPrivateGotMapChipFlag) &&
 				_privateFlags.getFlag(kMarsPrivateGotShieldChipFlag) &&
 				_privateFlags.getFlag(kMarsPrivateGotOpticalChipFlag)) {
@@ -2077,7 +2077,7 @@ void Mars::turnRight() {
 
 void Mars::receiveNotification(Notification *notification, const NotificationFlags flag) {
 	InventoryItem *item;
-	
+
 	Neighborhood::receiveNotification(notification, flag);
 
 	if ((flag & kExtraCompletedFlag) != 0) {
@@ -2370,13 +2370,13 @@ void Mars::spotCompleted() {
 		g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/Mars/XN59WD", false, kWarningInterruption);
 }
 
-void Mars::doCanyonChase() {	
+void Mars::doCanyonChase() {
 	GameState.setScoringEnteredShuttle();
 	setNextHandler(_vm);
 	throwAwayInterface();
 
 	_vm->_cursor->hide();
-	
+
 	// Open the spot sounds movie again...
 	_spotSounds.initFromQuickTime(getSoundSpotsName());
 	_spotSounds.setVolume(_vm->getSoundFXLevel());
@@ -2427,38 +2427,38 @@ void Mars::doCanyonChase() {
 
 	initOneMovie(&_leftShuttleMovie, "Images/Mars/Left Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleLeftLeft, kShuttleLeftTop, false);
-	
+
 	initOneMovie(&_rightShuttleMovie, "Images/Mars/Right Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleRightLeft, kShuttleRightTop, false);
-	
+
 	initOneMovie(&_lowerLeftShuttleMovie, "Images/Mars/Lower Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerLeftLeft, kShuttleLowerLeftTop, false);
-	
+
 	initOneMovie(&_lowerRightShuttleMovie, "Images/Mars/Lower Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerRightLeft, kShuttleLowerRightTop, false);
-	
+
 	initOneMovie(&_centerShuttleMovie, "Images/Mars/Center Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleCenterLeft, kShuttleCenterTop, false);
-	
+
 	initOneMovie(&_upperLeftShuttleMovie, "Images/Mars/Upper Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperLeftLeft, kShuttleUpperLeftTop, false);
-	
+
 	initOneMovie(&_upperRightShuttleMovie, "Images/Mars/Upper Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperRightLeft, kShuttleUpperRightTop, false);
-	
+
 	initOneMovie(&_leftDamageShuttleMovie, "Images/Mars/Left Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleLeftEnergyLeft, kShuttleLeftEnergyTop, false);
-	
+
 	initOneMovie(&_rightDamageShuttleMovie, "Images/Mars/Right Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleRightEnergyLeft, kShuttleRightEnergyTop, false);
-	
+
 	_centerShuttleMovie.show();
 	_centerShuttleMovie.setTime(kShuttleCenterBoardingTime);
 	playSpotSoundSync(kShuttleCockpitIn, kShuttleCockpitOut);
-	
+
 	_centerShuttleMovie.setTime(kShuttleCenterCheckTime);
 	playSpotSoundSync(kShuttleOnboardIn, kShuttleOnboardOut);
-	
+
 	_shuttleEnergyMeter.initShuttleEnergyMeter();
 	_shuttleEnergyMeter.powerUpMeter();
 	while (_shuttleEnergyMeter.isFading()) {
@@ -2472,7 +2472,7 @@ void Mars::doCanyonChase() {
 
 	_leftShuttleMovie.setTime(kShuttleLeftNormalTime);
 	_leftShuttleMovie.redrawMovieWorld();
-	
+
 	_leftDamageShuttleMovie.show();
 	playMovieSegment(&_leftDamageShuttleMovie);
 
@@ -2480,7 +2480,7 @@ void Mars::doCanyonChase() {
 	// so that subsequence drops will drop it down a tick.
 	_leftDamageShuttleMovie.setTime(_leftDamageShuttleMovie.getTime() - 40);
 	_leftDamageShuttleMovie.redrawMovieWorld();
-	
+
 	_lowerRightShuttleMovie.show();
 	_lowerRightShuttleMovie.setTime(kShuttleLowerRightOffTime);
 	_lowerRightShuttleMovie.redrawMovieWorld();
@@ -2542,31 +2542,31 @@ void Mars::startUpFromFinishedSpaceChase() {
 							kShuttle3Top, true);
 	initOnePicture(&_shuttleInterface4, "Images/Mars/MCmain4.pict", kShuttleBackgroundOrder, kShuttle4Left,
 							kShuttle4Top, true);
-	
+
 	initOneMovie(&_leftShuttleMovie, "Images/Mars/Left Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleLeftLeft, kShuttleLeftTop, false);
-	
+
 	initOneMovie(&_rightShuttleMovie, "Images/Mars/Right Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleRightLeft, kShuttleRightTop, false);
-	
+
 	initOneMovie(&_lowerLeftShuttleMovie, "Images/Mars/Lower Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerLeftLeft, kShuttleLowerLeftTop, false);
-	
+
 	initOneMovie(&_lowerRightShuttleMovie, "Images/Mars/Lower Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerRightLeft, kShuttleLowerRightTop, false);
-	
+
 	initOneMovie(&_centerShuttleMovie, "Images/Mars/Center Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleCenterLeft, kShuttleCenterTop, false);
-	
+
 	initOneMovie(&_upperLeftShuttleMovie, "Images/Mars/Upper Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperLeftLeft, kShuttleUpperLeftTop, false);
-	
+
 	initOneMovie(&_upperRightShuttleMovie, "Images/Mars/Upper Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperRightLeft, kShuttleUpperRightTop, false);
-	
+
 	initOneMovie(&_leftDamageShuttleMovie, "Images/Mars/Left Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleLeftEnergyLeft, kShuttleLeftEnergyTop, false);
-	
+
 	initOneMovie(&_rightDamageShuttleMovie, "Images/Mars/Right Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleRightEnergyLeft, kShuttleRightEnergyTop, false);
 
@@ -2612,7 +2612,7 @@ void Mars::startUpFromFinishedSpaceChase() {
 
 	_lowerLeftShuttleMovie.setTime(kShuttleLowerLeftAutopilotTime);
 	_lowerLeftShuttleMovie.redrawMovieWorld();
-	
+
 	_shuttleTransportSpot.setArea(kShuttleTransportBounds);
 	_shuttleTransportSpot.setHotspotFlags(kNeighborhoodSpotFlag | kClickSpotFlag);
 	_vm->getAllHotspots().push_back(&_shuttleTransportSpot);
@@ -2638,11 +2638,11 @@ void Mars::startUpFromFinishedSpaceChase() {
 void Mars::startUpFromSpaceChase() {
 	setNextHandler(_vm);
 	throwAwayInterface();
-	
+
 	// Open the spot sounds movie again...
 	_spotSounds.initFromQuickTime(getSoundSpotsName());
 	_spotSounds.setVolume(_vm->getSoundFXLevel());;
-	
+
 	initOnePicture(&_shuttleInterface1, "Images/Mars/MCmain1.pict", kShuttleBackgroundOrder, kShuttle1Left,
 							kShuttle1Top, true);
 	initOnePicture(&_shuttleInterface2, "Images/Mars/MCmain2.pict", kShuttleBackgroundOrder, kShuttle2Left,
@@ -2651,31 +2651,31 @@ void Mars::startUpFromSpaceChase() {
 							kShuttle3Top, true);
 	initOnePicture(&_shuttleInterface4, "Images/Mars/MCmain4.pict", kShuttleBackgroundOrder, kShuttle4Left,
 							kShuttle4Top, true);
-	
+
 	initOneMovie(&_leftShuttleMovie, "Images/Mars/Left Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleLeftLeft, kShuttleLeftTop, false);
-	
+
 	initOneMovie(&_rightShuttleMovie, "Images/Mars/Right Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleRightLeft, kShuttleRightTop, false);
-	
+
 	initOneMovie(&_lowerLeftShuttleMovie, "Images/Mars/Lower Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerLeftLeft, kShuttleLowerLeftTop, false);
-	
+
 	initOneMovie(&_lowerRightShuttleMovie, "Images/Mars/Lower Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleLowerRightLeft, kShuttleLowerRightTop, false);
-	
+
 	initOneMovie(&_centerShuttleMovie, "Images/Mars/Center Shuttle.movie",
 			kShuttleMonitorOrder, kShuttleCenterLeft, kShuttleCenterTop, false);
-	
+
 	initOneMovie(&_upperLeftShuttleMovie, "Images/Mars/Upper Left Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperLeftLeft, kShuttleUpperLeftTop, false);
-	
+
 	initOneMovie(&_upperRightShuttleMovie, "Images/Mars/Upper Right Shuttle.movie", kShuttleMonitorOrder,
 			kShuttleUpperRightLeft, kShuttleUpperRightTop, false);
-	
+
 	initOneMovie(&_leftDamageShuttleMovie, "Images/Mars/Left Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleLeftEnergyLeft, kShuttleLeftEnergyTop, false);
-	
+
 	initOneMovie(&_rightDamageShuttleMovie, "Images/Mars/Right Damage Shuttle.movie",
 			kShuttleStatusOrder, kShuttleRightEnergyLeft, kShuttleRightEnergyTop, false);
 
@@ -2687,7 +2687,7 @@ void Mars::startUpFromSpaceChase() {
 	_leftShuttleMovie.show();
 	_leftShuttleMovie.setTime(kShuttleLeftNormalTime);
 	_leftShuttleMovie.redrawMovieWorld();
-	
+
 	_leftDamageShuttleMovie.show();
 	_leftDamageShuttleMovie.setTime(_leftDamageShuttleMovie.getDuration() - 40);
 	_leftDamageShuttleMovie.redrawMovieWorld();
@@ -2697,14 +2697,14 @@ void Mars::startUpFromSpaceChase() {
 	_lowerLeftShuttleMovie.show();
 
 	loadLoopSound1("Sounds/Mars/Space Ambient.22K.8.AIFF");
-	
+
 	initOneMovie(&_planetMovie, "Images/Mars/Planet.movie", kShuttlePlanetOrder,
 			kPlanetStartLeft, kPlanetStartTop, true);
 	_planetMovie.setFlags(kLoopTimeBase);
 
 	initOneMovie(&_junk, "Images/Mars/Junk.movie", kShuttleJunkOrder, kShuttleJunkLeft,
 			kShuttleJunkTop, false);
-	
+
 	initOneMovie(&_explosions, "Images/Mars/Explosions.movie", kShuttleWeaponFrontOrder, 0, 0, false);
 	_explosionCallBack.initCallBack(&_explosions, kCallBackAtExtremes);
 
@@ -2850,7 +2850,7 @@ void Mars::marsTimerExpired(MarsTimerEvent &event) {
 		playSpotSoundSync(kShuttleTractorDescIn, kShuttleTractorDescOut);
 		_upperLeftShuttleMovie.setTime(kShuttleUpperLeftDimTime);
 		_upperLeftShuttleMovie.redrawMovieWorld();
-			
+
 		_centerShuttleMovie.setTime(kShuttleCenterTargetSightedTime);
 		_centerShuttleMovie.redrawMovieWorld();
 		playSpotSoundSync(kShuttleTargetSightedIn, kShuttleTargetSightedOut);
@@ -2904,7 +2904,7 @@ void Mars::marsTimerExpired(MarsTimerEvent &event) {
 		startMarsTimer(kSpaceChaseTimeLimit, kOneTickPerSecond, kMarsSpaceChaseFinished);
 
 		_vm->_cursor->hideUntilMoved();
-		break;			
+		break;
 	case kMarsSpaceChaseFinished:
 		// Player failed to stop the robot in time...
 		_interruptionFilter = kFilterNoInput;
@@ -2929,7 +2929,7 @@ void Mars::marsTimerExpired(MarsTimerEvent &event) {
 		r = Common::Rect(kShuttleWindowMidH - x, kShuttleWindowMidV - y,
 				kShuttleWindowMidH - x + 20, kShuttleWindowMidV - y + 20);
 		showBigExplosion(r, kShuttleAlienShipOrder);
-			
+
 		while (_explosions.isRunning()) {
 			_vm->checkCallBacks();
 			_vm->refreshDisplay();
@@ -2958,7 +2958,7 @@ void Mars::throwAwayMarsShuttle() {
 	_shuttleInterface4.stopDisplaying();
 
 	_spotSounds.disposeSound();
-	
+
 	_canyonChaseMovie.releaseMovie();
 	_canyonChaseMovie.stopDisplaying();
 	_leftShuttleMovie.releaseMovie();
@@ -3211,7 +3211,7 @@ void Mars::showBigExplosion(const Common::Rect &r, const DisplayOrder order) {
 		r2.left -= dx;
 		r2.right += dx;
 		r2.top -= dy;
-		r2.bottom += dy;		
+		r2.bottom += dy;
 
 		_explosions.setBounds(r2);
 		_explosions.show();
@@ -3223,7 +3223,7 @@ void Mars::showBigExplosion(const Common::Rect &r, const DisplayOrder order) {
 	}
 }
 
-void Mars::showLittleExplosion(const Common::Rect &r, const DisplayOrder order) {	
+void Mars::showLittleExplosion(const Common::Rect &r, const DisplayOrder order) {
 	if (_explosions.isMovieValid()) {
 		_explosions.setDisplayOrder(order);
 
@@ -3245,7 +3245,7 @@ void Mars::showLittleExplosion(const Common::Rect &r, const DisplayOrder order)
 	}
 }
 
-void Mars::hitByJunk() {	
+void Mars::hitByJunk() {
 	_leftDamageShuttleMovie.setTime(_leftDamageShuttleMovie.getTime() - 40);
 	_leftDamageShuttleMovie.redrawMovieWorld();
 
@@ -3272,7 +3272,7 @@ void Mars::setUpNextDropTime() {
 	_robotShip.setUpNextDropTime();
 }
 
-void Mars::decreaseRobotShuttleEnergy(const int delta, Common::Point impactPoint) {	
+void Mars::decreaseRobotShuttleEnergy(const int delta, Common::Point impactPoint) {
 	_rightDamageShuttleMovie.setTime(_rightDamageShuttleMovie.getTime() - 40 * delta);
 	_rightDamageShuttleMovie.redrawMovieWorld();
 
diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h
index 3ddbf39515..9ca53a8021 100644
--- a/engines/pegasus/neighborhood/mars/mars.h
+++ b/engines/pegasus/neighborhood/mars/mars.h
@@ -115,7 +115,7 @@ protected:
 		kMarsPrivateGotShieldChipFlag,
 		kNumMarsPrivateFlags
 	};
-	
+
 	void init();
 	void start();
 	void setUpAIRules();
@@ -126,7 +126,7 @@ protected:
 	void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *);
 	void clickInHotspot(const Input &, const Hotspot *);
 	InputBits getInputFilter();
-	
+
 	TimeValue getViewTime(const RoomID, const DirectionConstant);
 	void getZoomEntry(const HotSpotID, ZoomTable::Entry &);
 	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
@@ -143,7 +143,7 @@ protected:
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
 	void lockThawed();
 	void robotTiredOfWaiting();
-	
+
 	void setUpReactorLevel1();
 	void setUpNextReactorLevel();
 	void makeColorSequence();
@@ -184,7 +184,7 @@ protected:
 
 	Common::String getSoundSpotsName();
 	Common::String getNavMovieName();
-	
+
 	InventoryItem *_attackingItem;
 	FuseFunction _bombFuse;
 	FuseFunction _noAirFuse;
diff --git a/engines/pegasus/neighborhood/mars/planetmover.cpp b/engines/pegasus/neighborhood/mars/planetmover.cpp
index ef26a7b573..a340120c12 100644
--- a/engines/pegasus/neighborhood/mars/planetmover.cpp
+++ b/engines/pegasus/neighborhood/mars/planetmover.cpp
@@ -57,7 +57,7 @@ void PlanetMover::stopMoving() {
 	stop();
 }
 
-void PlanetMover::dropPlanetOutOfSight() {	
+void PlanetMover::dropPlanetOutOfSight() {
 	stop();
 	CoordType currentLoc = hermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
 	CoordType currentV = dHermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
diff --git a/engines/pegasus/neighborhood/mars/planetmover.h b/engines/pegasus/neighborhood/mars/planetmover.h
index cc2c412548..2c195387e8 100644
--- a/engines/pegasus/neighborhood/mars/planetmover.h
+++ b/engines/pegasus/neighborhood/mars/planetmover.h
@@ -45,7 +45,7 @@ public:
 protected:
 	void newDestination();
 	virtual void timeChanged(const TimeValue);
-	
+
 	Movie *_planetMovie;
 	CoordType _p1, _p4, _r1, _r4;
 	TimeValue _duration;
diff --git a/engines/pegasus/neighborhood/mars/reactor.cpp b/engines/pegasus/neighborhood/mars/reactor.cpp
index 478a01c155..334fb98879 100644
--- a/engines/pegasus/neighborhood/mars/reactor.cpp
+++ b/engines/pegasus/neighborhood/mars/reactor.cpp
@@ -66,7 +66,7 @@ void ReactorGuess::setGuess(int32 a, int32 b, int32 c) {
 	triggerRedraw();
 }
 
-void ReactorGuess::draw(const Common::Rect &) {	
+void ReactorGuess::draw(const Common::Rect &) {
 	if (_colors.isSurfaceValid()) {
 		Common::Rect r1(0, 0, kOneGuessWidth, kOneGuessHeight);
 		Common::Rect r2 = r1;
@@ -115,7 +115,7 @@ void ReactorChoiceHighlight::disposeReactorChoiceHighlight() {
 	_colors.deallocateSurface();
 }
 
-void ReactorChoiceHighlight::draw(const Common::Rect &) {	
+void ReactorChoiceHighlight::draw(const Common::Rect &) {
 	if (_colors.isSurfaceValid()) {
 		for (int i = 0; i < 5; ++i) {
 			if (_choices.getFlag(i)) {
@@ -232,7 +232,7 @@ void ReactorHistory::showAnswer() {
 	triggerRedraw();
 }
 
-bool ReactorHistory::isSolved() {	
+bool ReactorHistory::isSolved() {
 	for (int i = 0; i < _numGuesses; i++)
 		if (_history[i][0] == _answer[0] && _history[i][1] == _answer[1] && _history[i][2] == _answer[2])
 			return true;
@@ -284,7 +284,7 @@ void ReactorHistory::draw(const Common::Rect &) {
 	}
 }
 
-int32 ReactorHistory::getCurrentNumCorrect() {	
+int32 ReactorHistory::getCurrentNumCorrect() {
 	int correct = 0;
 
 	for (int i = 0; i < 3; i++)
diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp
index 639f208fc8..1f4bbc1779 100644
--- a/engines/pegasus/neighborhood/mars/robotship.cpp
+++ b/engines/pegasus/neighborhood/mars/robotship.cpp
@@ -71,7 +71,7 @@ RobotShip::~RobotShip() {
 	g_robotShip = 0;
 }
 
-void RobotShip::initRobotShip() {	
+void RobotShip::initRobotShip() {
 	_spritesMovie.initFromMovieFile("Images/Mars/Ship.movie", true);
 	_spritesMovie.setDisplayOrder(kShuttleRobotShipOrder);
 	_spritesMovie.moveElementTo(kPlanetStartLeft, kPlanetStartTop);
@@ -124,7 +124,7 @@ void RobotShip::setUpNextDropTime() {
 	}
 }
 
-void RobotShip::timeToDropJunk() {	
+void RobotShip::timeToDropJunk() {
 	if (g_spaceJunk) {
 		CoordType x, y;
 		_spritesMovie.getCenter(x, y);
@@ -156,7 +156,7 @@ void RobotShip::newDestination() {
 				_p4.y += kRovingHeight;
 		}
 	}
-	
+
 	makeVelocityVector(_p4.x, _p4.y, kShuttleWindowLeft + kShuttleWindowWidth / 2,
 			kShuttleWindowTop + kShuttleWindowHeight / 2, _r4);
 	stop();
@@ -222,7 +222,7 @@ void RobotShip::hitByGravitonCannon(Common::Point impactPoint) {
 	((Mars *)g_neighborhood)->decreaseRobotShuttleEnergy(6, impactPoint);
 }
 
-void RobotShip::snareByTractorBeam() {	
+void RobotShip::snareByTractorBeam() {
 	_dropJunkFuse.stopFuse();
 	stop();
 
@@ -255,7 +255,7 @@ void RobotShip::timeChanged(const TimeValue) {
 	}
 }
 
-void RobotShip::makeVelocityVector(CoordType x1, CoordType y1, CoordType x2, CoordType y2, Common::Point &vector) {	
+void RobotShip::makeVelocityVector(CoordType x1, CoordType y1, CoordType x2, CoordType y2, Common::Point &vector) {
 	CoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength;
 	vector.x = x2 - x1;
 	vector.y = y2 - y1;
diff --git a/engines/pegasus/neighborhood/mars/shuttleenergymeter.cpp b/engines/pegasus/neighborhood/mars/shuttleenergymeter.cpp
index 21bb1fb700..cd08dbae6a 100644
--- a/engines/pegasus/neighborhood/mars/shuttleenergymeter.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttleenergymeter.cpp
@@ -83,7 +83,7 @@ void ShuttleEnergyMeter::setEnergyValue(const int32 value) {
 	startFader(moveSpec);
 }
 
-void ShuttleEnergyMeter::drainForTractorBeam() {	
+void ShuttleEnergyMeter::drainForTractorBeam() {
 	stopFader();
 	TimeValue startTime = 0, stopTime;
 	int32 startValue = getFaderValue(), stopValue;
diff --git a/engines/pegasus/neighborhood/mars/shuttlehud.cpp b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
index 14f5b88319..11e826278b 100644
--- a/engines/pegasus/neighborhood/mars/shuttlehud.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
@@ -128,7 +128,7 @@ void ShuttleHUD::hideTargetGrid() {
 	unlockOnTarget();
 }
 
-void ShuttleHUD::useIdleTime() {	
+void ShuttleHUD::useIdleTime() {
 	if (isVisible()) {
 		Common::Rect r;
 		g_robotShip->getShuttleBounds(r);
diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
index 0151a26f29..b4c360b280 100644
--- a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
@@ -53,7 +53,7 @@ bool ShuttleWeapon::canFireWeapon() {
 	return !isRunning();
 }
 
-void ShuttleWeapon::fireWeapon(const CoordType hStop, const CoordType vStop) {	
+void ShuttleWeapon::fireWeapon(const CoordType hStop, const CoordType vStop) {
 	if (!isRunning()) {
 		stop();
 		setTime(0);
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp
index ac8b1a23cc..3912e659c2 100644
--- a/engines/pegasus/neighborhood/mars/spacejunk.cpp
+++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp
@@ -49,7 +49,7 @@ SpaceJunk::~SpaceJunk() {
 	g_spaceJunk = 0;
 }
 
-void SpaceJunk::launchJunk(int16 whichJunk, CoordType xOrigin, CoordType yOrigin) {	
+void SpaceJunk::launchJunk(int16 whichJunk, CoordType xOrigin, CoordType yOrigin) {
 	_bouncing = false;
 	TimeValue startTime = whichJunk * 16 * 40;
 	TimeValue stopTime = startTime + 16 * 40;
@@ -93,7 +93,7 @@ void SpaceJunk::setScaleSize(const CoordType size) {
 	setBounds(r);
 }
 
-void SpaceJunk::useIdleTime() {	
+void SpaceJunk::useIdleTime() {
 	if (_bouncing) {
 		TimeValue time = _timer.getTime();
 		Common::Point pt;
@@ -116,7 +116,7 @@ void SpaceJunk::useIdleTime() {
 		Common::Point pt2D;
 		project3DTo2D(_junkPosition, pt2D);
 		setCenter(pt2D.x, pt2D.y);
-		setScaleSize((int)(convertSpaceYToScreenV(_junkPosition.y - kJunkSize / 2, _junkPosition.z) - 
+		setScaleSize((int)(convertSpaceYToScreenV(_junkPosition.y - kJunkSize / 2, _junkPosition.z) -
 				convertSpaceYToScreenV(_junkPosition.y + kJunkSize / 2, _junkPosition.z)));
 
 		if (t == 1.0) {
@@ -188,7 +188,7 @@ void SpaceJunk::hitByEnergyBeam(Common::Point) {
 	setGlowing(false);
 }
 
-void SpaceJunk::hitByGravitonCannon(Common::Point impactPoint) {	
+void SpaceJunk::hitByGravitonCannon(Common::Point impactPoint) {
 	stop();
 	stopIdling();
 	hide();
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.h b/engines/pegasus/neighborhood/mars/spacejunk.h
index f2dbf9a838..2ec9192513 100644
--- a/engines/pegasus/neighborhood/mars/spacejunk.h
+++ b/engines/pegasus/neighborhood/mars/spacejunk.h
@@ -46,9 +46,9 @@ public:
 	void setScaleSize(const CoordType);
 
 	void useIdleTime();
-	
+
 	void launchJunk(int16, CoordType, CoordType);
-	
+
 	void getJunkPosition(Point3D &);
 	bool isJunkFlying();
 
diff --git a/engines/pegasus/neighborhood/mars/tractorbeam.cpp b/engines/pegasus/neighborhood/mars/tractorbeam.cpp
index 81c96299cf..d3f9c94328 100644
--- a/engines/pegasus/neighborhood/mars/tractorbeam.cpp
+++ b/engines/pegasus/neighborhood/mars/tractorbeam.cpp
@@ -97,7 +97,7 @@ void TractorBeam::draw(const Common::Rect &) {
 		byte *pTopRight = rowPtrTop + (kHalfWidth * 2 - 1) * screen->format.bytesPerPixel;
 		byte *pBottomLeft = rowPtrBottom;
 		byte *pBottomRight = rowPtrBottom + (kHalfWidth * 2 - 1) * screen->format.bytesPerPixel;
-		
+
 		for (int x = kHalfWidth; x > 0; x--) {
 			byte r, g, b;
 			uint32 color;
@@ -106,12 +106,12 @@ void TractorBeam::draw(const Common::Rect &) {
 			DO_BLEND(pTopRight);
 			DO_BLEND(pBottomLeft);
 			DO_BLEND(pBottomRight);
-			
+
 			pTopLeft += screen->format.bytesPerPixel;
 			pBottomLeft += screen->format.bytesPerPixel;
 			pTopRight -= screen->format.bytesPerPixel;
 			pBottomRight -= screen->format.bytesPerPixel;
-			
+
 			while (dHoriz > kW3Div2Horiz) {
 				blendHoriz++;
 				dHoriz -= kW3Horiz;
@@ -121,10 +121,10 @@ void TractorBeam::draw(const Common::Rect &) {
 			d1Horiz += d2Horiz;
 			d2Horiz += d3Horiz;
 		}
-		
+
 		rowPtrTop += screen->pitch;
 		rowPtrBottom -= screen->pitch;
-		
+
 		while (dVert > kW3Div2Vert) {
 			blendVert++;
 			dVert -= kW3Vert;