PEGASUS: Some space/misc cleanup

14 files changed, 78 insertions, 78 deletions

diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 1ea6e12f85..a4beecde9b 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -146,7 +146,7 @@ static const TimeValue k5To2Time = 41240;
 
 static const TimeValue k5To3Time = 41280;
 
-//	FuseFunction functions...
+// FuseFunction functions...
 
 const NotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1;
 
@@ -182,7 +182,7 @@ Caldoria::~Caldoria() {
 void Caldoria::init() {
 	Neighborhood::init();
 
-	//	We need this notification flag as well.
+	// We need this notification flag as well.
 	_neighborhoodNotification.notifyMe(this, kSinclairLoopDoneFlag, kSinclairLoopDoneFlag);
 
 	_sinclairInterrupt.initCallBack(&_navMovie, kCallBackAtTime);
@@ -948,7 +948,7 @@ void Caldoria::setUpRoofTop() {
 		if (GameState.getCurrentDirection() == kEast && GameState.getCaldoriaGunAimed())
 			startExtraSequence(kCa53EastShootSinclair, kExtraCompletedFlag, false);
 		else
-			//	Fall through...
+			// Fall through...
 	case kCaldoria49:
 	case kCaldoria50:
 	case kCaldoria51:
@@ -1548,9 +1548,9 @@ void Caldoria::newInteraction(const InteractionID interactionID) {
 	}
 }
 
-//	Only called when trying to pick up an item and the player can't (because
-//	the inventory is too full or because the player lets go of the item before
-//	dropping it into the inventory).
+// Only called when trying to pick up an item and the player can't (because
+// the inventory is too full or because the player lets go of the item before
+// dropping it into the inventory).
 Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) {
 	HotSpotID destSpotID = kNoHotSpotID;
 	
@@ -1919,7 +1919,7 @@ Common::String Caldoria::getHintMovie(uint hintNum) {
 				else if (GameState.isTakenItemID(kShieldBiochip))
 					return "Images/AI/Caldoria/X48ND3";
 
-				//	*** Doesn't work yet, need global movies.
+				// *** Doesn't work yet, need global movies.
 				break;
 			} 
 
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h
index 64e566e95a..f02101ec3b 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.h
@@ -34,13 +34,13 @@ static const TimeScale kCaldoriaMovieScale = 600;
 static const TimeScale kCaldoriaFramesPerSecond = 15;
 static const TimeScale kCaldoriaFrameDuration = 40;
 
-//	Alternate IDs.
+// Alternate IDs.
 
 static const AlternateID kAltCaldoriaNormal = 0;
 static const AlternateID kAltCaldoriaRoofDoorBlown = 2;
 static const AlternateID kAltCaldoriaSinclairDown = 3;
 
-//	Room IDs.
+// Room IDs.
 
 static const RoomID kCaldoria00 = 1;
 static const RoomID kCaldoria01 = 2;
@@ -106,7 +106,7 @@ static const RoomID kCaldoria55 = 61;
 static const RoomID kCaldoria56 = 62;
 static const RoomID kCaldoriaDeathRoom = 0;
 
-//	Hot Spot Activation IDs.
+// Hot Spot Activation IDs.
 
 static const HotSpotActivationID kActivate4DClosed = 1;
 static const HotSpotActivationID kActivate4DOpen = 2;
@@ -124,7 +124,7 @@ static const HotSpotActivationID kActivateReadyToTransport = 13;
 static const HotSpotActivationID kActivateRoofSlotEmpty = 14;
 static const HotSpotActivationID kActivateZoomedOnSinclair = 15;
 
-//	Hot Spot IDs.
+// Hot Spot IDs.
 
 static const HotSpotID kCa4DEnvironOpenSpotID = 5000;
 static const HotSpotID kCa4DEnvironCloseSpotID = 5001;
@@ -196,7 +196,7 @@ static const HotSpotID kCaldoriaRoofDoorSpotID = 5066;
 static const HotSpotID kCaldoriaRoofCardDropSpotID = 5067;
 static const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068;
 
-//	Extra sequence IDs.
+// Extra sequence IDs.
 
 static const ExtraID kCaldoriaWakeUpView1 = 0;
 static const ExtraID kCaldoria00WakeUp1 = 1;
@@ -310,14 +310,14 @@ static const ExtraID kCaldoria56BombStage6 = 108;
 static const ExtraID kCaldoria56BombStage7 = 109;
 static const ExtraID kCaldoria56BombExplodes = 110;
 
-//	Caldoria interactions.
+// Caldoria interactions.
 
 static const InteractionID kCaldoria4DInteractionID = 0;
 static const InteractionID kCaldoriaBombInteractionID = 1;
 static const InteractionID kCaldoriaMessagesInteractionID = 2;
 static const InteractionID kCaldoriaMirrorInteractionID = 3;
 
-//	Caldoria:
+// Caldoria:
 
 static const DisplayOrder kVidPhoneOrder = kMonitorLayer;
 static const DisplayOrder k4DSpritesOrder = kMonitorLayer;
@@ -330,7 +330,7 @@ static const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1;
 
 /////////////////////////////////////////////
 //
-//	Caldoria
+// Caldoria
 
 static const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105;
 static const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28;
@@ -374,7 +374,7 @@ static const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58;
 static const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58;
 static const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204;
 
-//	Caldoria display IDs.
+// Caldoria display IDs.
 
 static const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID;
 static const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1;
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index 0326bb7bb1..d8ac3b08cb 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -30,9 +30,9 @@
 namespace Pegasus {
 
 static const TimeValue kSwitchableSlop = 3 * kCaldoriaFrameDuration;
-//	Two seconds - some slop
+// Two seconds - some slop
 static const TimeValue kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop;
-//	Twelve frames + some slop
+// Twelve frames + some slop
 static const TimeValue kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop;
 
 static const TimeValue kSwitchable1Start = 0;
diff --git a/engines/pegasus/neighborhood/door.h b/engines/pegasus/neighborhood/door.h
index 55c36b659a..cd2af1328a 100755
--- a/engines/pegasus/neighborhood/door.h
+++ b/engines/pegasus/neighborhood/door.h
@@ -40,8 +40,8 @@ namespace Pegasus {
 typedef byte DoorFlags;
 
 enum {
-	kDoorPresentBit,				//	Bit set if there is a door here.
-	kDoorLockedBit					//	Bit set if door is locked, clear if unlocked.
+	kDoorPresentBit, // Bit set if there is a door here.
+	kDoorLockedBit   // Bit set if door is locked, clear if unlocked.
 };
 
 static const DoorFlags kNoDoorFlags = 0;
diff --git a/engines/pegasus/neighborhood/exit.h b/engines/pegasus/neighborhood/exit.h
index 10b1b5938e..baa3381f11 100755
--- a/engines/pegasus/neighborhood/exit.h
+++ b/engines/pegasus/neighborhood/exit.h
@@ -68,11 +68,11 @@ public:
 		AlternateID altCode;
 		TimeValue movieStart;
 		TimeValue movieEnd;
-		//	fExitEnd is the end of the optimized run of walks.
+		// exitEnd is the end of the optimized run of walks.
 		TimeValue exitEnd;
 		TimeValue originalEnd;
-		//	fExitLoop is the loop start time of the optimized run of walks if the run
-		//	loops back on itself (so far, only in TSA).
+		// exitLoop is the loop start time of the optimized run of walks if the run
+		// loops back on itself (so far, only in TSA).
 		TimeValue exitLoop;
 		RoomID exitRoom;
 		DirectionConstant exitDirection;
diff --git a/engines/pegasus/neighborhood/hotspotinfo.h b/engines/pegasus/neighborhood/hotspotinfo.h
index d75e5e9bc7..26382718ec 100755
--- a/engines/pegasus/neighborhood/hotspotinfo.h
+++ b/engines/pegasus/neighborhood/hotspotinfo.h
@@ -53,12 +53,12 @@ public:
 
 		HotSpotID hotspot;
 		HotSpotActivationID hotspotActivation;
-		//	Location hot spot lives in:
+		// Location hot spot lives in:
 		RoomID hotspotRoom;
 		DirectionConstant hotspotDirection;
-		//	Extra to play if this is a "play extra" hot spot.
+		// Extra to play if this is a "play extra" hot spot.
 		ExtraID hotspotExtra;
-		//	Item corresponding to this hot spot if it is an item-related hot spot.
+		// Item corresponding to this hot spot if it is an item-related hot spot.
 		ItemID hotspotItem;
 	};
 
diff --git a/engines/pegasus/neighborhood/mars/constants.h b/engines/pegasus/neighborhood/mars/constants.h
index b1013dacc5..82a7f03b68 100755
--- a/engines/pegasus/neighborhood/mars/constants.h
+++ b/engines/pegasus/neighborhood/mars/constants.h
@@ -30,7 +30,7 @@
 
 namespace Pegasus {
 
-//	Element Coordinates
+// Element Coordinates
 
 static const CoordType kUndoHiliteLeft = kNavAreaLeft + 140;
 static const CoordType kUndoHiliteTop = kNavAreaTop + 36;
@@ -136,7 +136,7 @@ static const TimeValue kLaunchTubeReachedTime = 60 * 600 + 38 * 600 - kCanyonCha
 static const TimeValue kCanyonChaseFinishedTime = kCanyonChaseStop - kCanyonChaseStart -
 											kLaunchTubeReachedTime;
 
-//	Left shuttle.
+// Left shuttle.
 
 static const TimeValue kShuttleLeftIntroStart = 0;
 static const TimeValue kShuttleLeftIntroStop = 400;
@@ -155,7 +155,7 @@ static const TimeValue kShuttleLeftGravitonTime = 600;
 
 static const TimeValue kShuttleLeftTractorTime = 640;
 
-//	Right shuttle.
+// Right shuttle.
 
 static const TimeValue kShuttleRightIntroStart = 0;
 static const TimeValue kShuttleRightIntroStop = 400;
@@ -175,7 +175,7 @@ static const TimeValue kShuttleRightGravitonTime = 1000;
 
 static const TimeValue kShuttleRightOverloadTime = 1040;
 
-//	Lower Left shuttle.
+// Lower Left shuttle.
 
 static const TimeValue kShuttleLowerLeftCollisionTime = 0;
 
@@ -183,7 +183,7 @@ static const TimeValue kShuttleLowerLeftTubeTime = 40;
 
 static const TimeValue kShuttleLowerLeftAutopilotTime = 80;
 
-//	Lower Right shuttle.
+// Lower Right shuttle.
 
 static const TimeValue kShuttleLowerRightOffTime = 0;
 
@@ -193,7 +193,7 @@ static const TimeValue kShuttleLowerRightTransportTime = 80;
 
 static const TimeValue kShuttleLowerRightTransportHiliteTime = 120;
 
-//	Center shuttle.
+// Center shuttle.
 
 static const TimeValue kShuttleCenterBoardingTime = 0;
 
@@ -223,7 +223,7 @@ static const TimeValue kShuttleCenterScanningTime = 480;
 
 static const TimeValue kShuttleCenterSafeTime = 520;
 
-//	Upper Left shuttle.
+// Upper Left shuttle.
 
 static const TimeValue kShuttleUpperLeftDimTime = 0;
 
@@ -233,7 +233,7 @@ static const TimeValue kShuttleUpperLeftGravitonTime = 80;
 
 static const TimeValue kShuttleUpperLeftTractorTime = 120;
 
-//	Upper Right shuttle.
+// Upper Right shuttle.
 
 static const TimeValue kShuttleUpperRightLockedTime = 0;
 
@@ -245,7 +245,7 @@ static const TimeValue kShuttleUpperRightOverloadTime = 120;
 
 static const TimeValue kShuttleUpperRightTargetDestroyedTime = 160;
 
-//	Shuttle distance
+// Shuttle distance
 
 static const int kShuttleDistance = 500;
 
@@ -469,7 +469,7 @@ static const TimeScale kMarsMovieScale = 600;
 static const TimeScale kMarsFramesPerSecond = 15;
 static const TimeScale kMarsFrameDuration = 40;
 
-//	Alternate IDs.
+// Alternate IDs.
 
 static const AlternateID kAltMarsNormal = 0;
 static const AlternateID kAltMarsPodAtMars34 = 1;
@@ -482,7 +482,7 @@ static const AlternateID kAltMarsMaskOnFiller = 7;
 static const AlternateID kAltMars60AirlockEast = 8;
 static const AlternateID kAltMars60AirlockWest = 9;
 
-//	Room IDs.
+// Room IDs.
 
 static const RoomID kMars0A = 0;
 static const RoomID kMars00 = 1;
@@ -711,7 +711,7 @@ static const RoomID kMarsMaze199 = 223;
 static const RoomID kMarsMaze200 = 224;
 static const RoomID kMarsDeathRoom = 225;
 
-//	Hot Spot Activation IDs.
+// Hot Spot Activation IDs.
 
 static const HotSpotActivationID kActivationReadyForKiosk = 1;
 static const HotSpotActivationID kActivationKioskChoice = 2;
@@ -738,7 +738,7 @@ static const HotSpotActivationID kActivateReactorBombExposed = 22;
 static const HotSpotActivationID kActivationRobotHeadClosed = 23;
 static const HotSpotActivationID kActivationRobotHeadOpen = 24;
 
-//	Hot Spot IDs.
+// Hot Spot IDs.
 
 static const HotSpotID kMars11NorthKioskSpotID = 5000;
 static const HotSpotID kMars11NorthKioskSightsSpotID = 5001;
@@ -814,7 +814,7 @@ static const HotSpotID kRobotShuttleMapChipSpotID = 5070;
 static const HotSpotID kRobotShuttleOpticalChipSpotID = 5071;
 static const HotSpotID kRobotShuttleShieldChipSpotID = 5072;
 
-//	Extra sequence IDs.
+// Extra sequence IDs.
 
 static const ExtraID kMarsArrivalFromTSA = 0;
 static const ExtraID kMars0AWatchShuttleDepart = 1;
diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
index 140bd12fc0..13dc6dfc77 100755
--- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
+++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
@@ -38,7 +38,7 @@ static const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, k
 static const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance);
 static const float kGravitonZOrigin = kGravitonMinDistance;
 
-//	Width of graviton sprite...
+// Width of graviton sprite...
 static const CoordType kGravitonMaxScreenWidth = 78;
 static const CoordType kGravitonMaxScreenHeight = 46;
 
diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
index c83636754e..b516989e4d 100644
--- a/engines/pegasus/neighborhood/neighborhood.cpp
+++ b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -240,7 +240,7 @@ void Neighborhood::arriveAt(RoomID room, DirectionConstant direction) {
 	checkContinuePoint(room, direction);
 }
 
-//	These functions can be overridden to tweak the exact frames used.
+// These functions can be overridden to tweak the exact frames used.
 
 void Neighborhood::getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry) {
 	entry = _exitTable.findEntry(room, direction, _currentAlternate);
@@ -305,7 +305,7 @@ void Neighborhood::getExtraEntry(const uint32 id, ExtraTable::Entry &extraEntry)
 
 /////////////////////////////////////////////
 //
-//	"Can" functions: Called to see whether or not a user is allowed to do something
+// "Can" functions: Called to see whether or not a user is allowed to do something
 
 CanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) {
 	DoorTable::Entry door;
@@ -313,8 +313,8 @@ CanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) {
 	getExitEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), entry);
 	getDoorEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), door);
 
-	//	Fixed this so that doors that don't lead anywhere can be opened, but not walked
-	//	through.
+	// Fixed this so that doors that don't lead anywhere can be opened, but not walked
+	// through.
 	if (door.flags & kDoorPresentMask) {
 		if (GameState.isCurrentDoorOpen()) {
 			if (entry.exitRoom == kNoRoomID)
@@ -593,9 +593,9 @@ void Neighborhood::stopStriding() {
 			kMoveForwardCompletedFlag, kNeighborhoodMovieCompletedFlag | kMoveForwardCompletedFlag);
 }
 
-//	Compass support
+// Compass support
 int16 Neighborhood::getStaticCompassAngle(const RoomID, const DirectionConstant dir) {
-	//	North, south, east, west
+	// North, south, east, west
 	static const int16 compassAngles[] = { 0, 180, 90, 270 };
 	return compassAngles[dir];
 }
@@ -1358,8 +1358,8 @@ void Neighborhood::getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec
 }
 
 void Neighborhood::setUpAIRules() {
-	//	Set up default rules here:
-	//	--  Energy warning rules.
+	// Set up default rules here:
+	// --  Energy warning rules.
 
 	if (g_AIArea) {
 		g_AIArea->forceAIUnlocked();
diff --git a/engines/pegasus/neighborhood/norad/constants.h b/engines/pegasus/neighborhood/norad/constants.h
index e86422a273..37c1769309 100755
--- a/engines/pegasus/neighborhood/norad/constants.h
+++ b/engines/pegasus/neighborhood/norad/constants.h
@@ -207,7 +207,7 @@ static const int16 kElevatorCompassAngle = -40;
 static const int16 kSubPlatformCompassAngle = 45;
 static const int16 kSubControlCompassAngle = -10;
 
-//	Norad interactions.
+// Norad interactions.
 
 static const InteractionID kNoradGlobeGameInteractionID = 0;
 static const InteractionID kNoradECRMonitorInteractionID = 1;
@@ -219,7 +219,7 @@ static const InteractionID kNoradSubPlatformInteractionID = 6;
 
 /////////////////////////////////////////////
 //
-//	Norad Alpha
+// Norad Alpha
 
 static const CoordType kECRSlideShowLeft = kNavAreaLeft + 78;
 static const CoordType kECRSlideShowTop = kNavAreaTop + 1;
@@ -306,7 +306,7 @@ static const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49;
 
 /////////////////////////////////////////////
 //
-//	Norad Delta
+// Norad Delta
 
 static const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360;
 static const CoordType kGlobeMonitorTop = kNavAreaTop + 144;
@@ -359,7 +359,7 @@ static const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212;
 static const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478;
 static const CoordType kGlobeCountdownTop = kNavAreaTop + 164;
 
-//	Norad Alpha display IDs.
+// Norad Alpha display IDs.
 
 static const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID;
 static const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1;
@@ -383,7 +383,7 @@ static const DisplayElementID kSubControlCCWID = kSubControlUpID + 1;
 static const DisplayElementID kSubControlCWID = kSubControlCCWID + 1;
 static const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1;
 
-//	Norad Delta display IDs.
+// Norad Delta display IDs.
 
 static const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID;
 static const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14;
@@ -403,7 +403,7 @@ static const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1
 static const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1;
 static const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1;
 
-//	Norad Alpha:
+// Norad Alpha:
 
 static const DisplayOrder kECRMonitorOrder = kMonitorLayer;
 static const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1;
@@ -431,7 +431,7 @@ static const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1;
 static const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1;
 static const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1;
 
-//	Norad Delta:
+// Norad Delta:
 
 static const DisplayOrder kGlobeMonitorLayer = kMonitorLayer;
 static const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1;
@@ -441,17 +441,17 @@ static const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1;
 static const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1;
 static const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1;
 
-//	Norad Alpha Tables
+// Norad Alpha Tables
 
 static const TimeScale kNoradAlphaMovieScale = 600;
 static const TimeScale kNoradAlphaFramesPerSecond = 15;
 static const TimeScale kNoradAlphaFrameDuration = 40;
 
-//	Alternate IDs.
+// Alternate IDs.
 
 static const AlternateID kAltNoradAlphaNormal = 0;
 
-//	Room IDs.
+// Room IDs.
 
 static const RoomID kNorad01 = 0;
 static const RoomID kNorad01East = 1;
@@ -484,10 +484,10 @@ static const RoomID kNorad21West = 27;
 static const RoomID kNorad22 = 28;
 static const RoomID kNorad22West = 29;
 
-//	Hot Spot Activation IDs.
+// Hot Spot Activation IDs.
 
 
-//	Hot Spot IDs.
+// Hot Spot IDs.
 
 static const HotSpotID kNorad01ECRSpotID = 5000;
 static const HotSpotID kNorad01GasSpotID = 5001;
@@ -537,7 +537,7 @@ static const HotSpotID kNorad22ClawUpSpotID = 5044;
 static const HotSpotID kNorad22ClawCCWSpotID = 5045;
 static const HotSpotID kNorad22ClawCWSpotID = 5046;
 
-//	Extra sequence IDs.
+// Extra sequence IDs.
 
 static const ExtraID kNoradArriveFromTSA = 0;
 static const ExtraID kNorad01RobotTaunt = 1;
@@ -583,7 +583,7 @@ static const ExtraID kN22ClawDCounterclockwise = 40;
 static const ExtraID kN22ClawDClockwise = 41;
 
 
-//	Norad Delta Extra sequence IDs.
+// Norad Delta Extra sequence IDs.
 
 static const ExtraID kArriveFromSubChase = 0;
 static const ExtraID kN59ZoomWithRobot = 1;
@@ -654,11 +654,11 @@ static const TimeScale kNoradDeltaMovieScale = 600;
 static const TimeScale kNoradDeltaFramesPerSecond = 15;
 static const TimeScale kNoradDeltaFrameDuration = 40;
 
-//	Alternate IDs.
+// Alternate IDs.
 
 static const AlternateID kAltNoradDeltaNormal = 0;
 
-//	Room IDs.
+// Room IDs.
 
 static const RoomID kNorad41 = 0;
 static const RoomID kNorad42 = 1;
@@ -700,10 +700,10 @@ static const RoomID kNorad78 = 36;
 static const RoomID kNorad79 = 37;
 static const RoomID kNorad79West = 38;
 
-//	Hot Spot Activation IDs.
+// Hot Spot Activation IDs.
 
 
-//	Hot Spot IDs.
+// Hot Spot IDs.
 
 static const HotSpotID kNorad48ElevatorSpotID = 5000;
 static const HotSpotID kNorad48ElevatorOutSpotID = 5001;
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index d413554c05..7d4c1c5f8f 100755
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -196,7 +196,7 @@ void GlobeTracker::stopGlobeMovie() {
 	}
 }
 
-//	Globe game PICTs:
+// Globe game PICTs:
 static const ResIDType kGlobeCircleLeftPICTID = 300;
 static const ResIDType kGlobeCircleRightPICTID = 301;
 static const ResIDType kGlobeCircleUpPICTID = 302;
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index 8a306fe2f1..b0e5b98725 100755
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -678,9 +678,9 @@ void SubControlRoom::receiveNotification(Notification *notification, const Notif
 						dispatchClawAction(kMoveLeftActionIndex);
 						break;
 					case kClawAtB:
-						if (_clawStartPosition == kClawAtD)				//	Norad Alpha
+						if (_clawStartPosition == kClawAtD)             // Norad Alpha
 							dispatchClawAction(kMoveLeftActionIndex);
-						else if (_clawStartPosition == kClawAtC)		//	Norad Delta
+						else if (_clawStartPosition == kClawAtC)        // Norad Delta
 							dispatchClawAction(kMoveUpActionIndex);
 						break;
 					case kClawAtC:
@@ -728,7 +728,7 @@ void SubControlRoom::activateHotspots() {
 		g_allHotspots.activateOneHotspot(_clawControlSpotID);
 		break;
 	case kClawMenu:
-		//	This could be called during a move, so use _clawNextPosition.
+		// This could be called during a move, so use _clawNextPosition.
 		if (_playingAgainstRobot) {
 			g_allHotspots.deactivateOneHotspot(_outSpotID);
 			if (_robotState != kRobotApproaching && _nextAction == kNoActionIndex)
@@ -813,9 +813,9 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) {
 					dispatchClawAction(kMoveLeftActionIndex);
 					break;
 				case kClawAtB:
-					if (_clawStartPosition == kClawAtD)				//	Norad Alpha
+					if (_clawStartPosition == kClawAtD)             // Norad Alpha
 						dispatchClawAction(kMoveLeftActionIndex);
-					else if (_clawStartPosition == kClawAtC)		//	Norad Delta
+					else if (_clawStartPosition == kClawAtC)        // Norad Delta
 						dispatchClawAction(kMoveUpActionIndex);
 					break;
 				case kClawAtC:
diff --git a/engines/pegasus/neighborhood/spot.cpp b/engines/pegasus/neighborhood/spot.cpp
index 00c471ed61..f285bf9bc2 100755
--- a/engines/pegasus/neighborhood/spot.cpp
+++ b/engines/pegasus/neighborhood/spot.cpp
@@ -55,10 +55,10 @@ void SpotTable::clear() {
 	_entries.clear();
 }
 
-//	Two CSpotIndices are equal if
-//		In addition to having their rooms, directions and alt codes identical...
-//		They are both either loops or once only animations AND
-//		They overlap in at least one of the on arrival, on turn and on door open bits.
+// Two SpotTable::Entries are equal if
+//      In addition to having their rooms, directions and alt codes identical...
+//      They are both either loops or once only animations AND
+//      They overlap in at least one of the on arrival, on turn and on door open bits.
 SpotTable::Entry SpotTable::findEntry(RoomID room, DirectionConstant direction, SpotFlags srcFlags, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode && (_entries[i].srcFlags & kSpotLoopsMask) == (srcFlags & kSpotLoopsMask) && ((_entries[i].srcFlags & srcFlags) & kSpotTriggers) != 0)
diff --git a/engines/pegasus/neighborhood/spot.h b/engines/pegasus/neighborhood/spot.h
index 086f1b2a2f..4be0864c2a 100755
--- a/engines/pegasus/neighborhood/spot.h
+++ b/engines/pegasus/neighborhood/spot.h
@@ -40,7 +40,7 @@ namespace Pegasus {
 typedef byte SpotFlags;
 
 enum {
-	kSpotLoopsBit,			//	Loop or once only?
+	kSpotLoopsBit, // Loop or once only?
 	kSpotOnArrivalBit,
 	kSpotOnTurnBit,
 	kSpotOnDoorOpenBit