1 files changed, 106 insertions, 106 deletions
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index 476dd92a61..8a306fe2f1 100755
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -34,122 +34,122 @@ namespace Pegasus {
 
 // Right Monitor times
 
-const TimeValue kAlphaClawSplashStart = 0;
-const TimeValue kAlphaClawSplashStop = 4000;
-
-const TimeValue kDeltaClawSplashStart = 4000;
-const TimeValue kDeltaClawSplashStop = 8000;
-
-const TimeValue kClawAtATime = 8000;
-const TimeValue kClawAtAPinchedTime = 8600;
-const TimeValue kClawAtATurnedTime = 9200;
-const TimeValue kClawAtAWithRobotPinchedTime = 9800;
-
-const TimeValue kClawAtBTime = 10400;
-const TimeValue kClawAtBPinchedTime = 11000;
-const TimeValue kClawAtBTurnedTime = 11600;
-const TimeValue kClawAtBWithRobotTime = 12200;
-const TimeValue kClawAtBWithRobotPinchedTime = 12800;
-
-const TimeValue kClawAtCTime = 13400;
-const TimeValue kClawAtCPinchedTime = 14000;
-const TimeValue kClawAtCTurnedTime = 14600;
-
-const TimeValue kClawAtDTime = 15200;
-const TimeValue kClawAtDPinchedTime = 15800;
-const TimeValue kClawAtDTurnedTime = 16400;
-
-const TimeValue kAToBStart = 17000;
-const TimeValue kAToBStop = 18680;
-const TimeValue kAPinchStart = 18680;
-const TimeValue kAPinchStop = 20200;
-const TimeValue kACCWStart = 20200;
-const TimeValue kACCWStop = 21600;
-const TimeValue kACWStart = 21600;
-const TimeValue kACWStop = 23000;
-
-const TimeValue kBToAStart = 23000;
-const TimeValue kBToAStop = 24680;
-const TimeValue kBToCStart = 24680;
-const TimeValue kBToCStop = 26520;
-const TimeValue kBToDStart = 26520;
-const TimeValue kBToDStop = 28320;
-const TimeValue kBPinchStart = 28320;
-const TimeValue kBPinchStop = 29680;
-const TimeValue kBCCWStart = 29680;
-const TimeValue kBCCWStop = 31200;
-const TimeValue kBCWStart = 31200;
-const TimeValue kBCWStop = 32720;
-
-const TimeValue kCToBStart = 32720;
-const TimeValue kCToBStop = 34560;
-const TimeValue kCPinchStart = 34560;
-const TimeValue kCPinchStop = 36400;
-const TimeValue kCCCWStart = 36400;
-const TimeValue kCCCWStop = 37840;
-const TimeValue kCCWStart = 37840;
-const TimeValue kCCWStop = 39280;
-
-const TimeValue kDToBStart = 39280;
-const TimeValue kDToBStop = 41080;
-const TimeValue kDPinchStart = 41080;
-const TimeValue kDPinchStop = 42600;
-const TimeValue kDCCWStart = 42600;
-const TimeValue kDCCWStop = 44000;
-const TimeValue kDCWStart = 44000;
-const TimeValue kDCWStop = 45400;
-
-const TimeValue kRobotApproachStart = 45400;
-const TimeValue kRobotApproachStop = 56800;
-
-const TimeValue kCToBWithRobotStart = 56800;
-const TimeValue kCToBWithRobotStop = 58600;
-
-const TimeValue kBPinchWithRobotStart = 58600;
-const TimeValue kBPinchWithRobotStop = 60400;
-const TimeValue kBToAWithRobotStart = 60400;
-const TimeValue kBToAWithRobotStop = 62240;
+static const TimeValue kAlphaClawSplashStart = 0;
+static const TimeValue kAlphaClawSplashStop = 4000;
+
+static const TimeValue kDeltaClawSplashStart = 4000;
+static const TimeValue kDeltaClawSplashStop = 8000;
+
+static const TimeValue kClawAtATime = 8000;
+static const TimeValue kClawAtAPinchedTime = 8600;
+static const TimeValue kClawAtATurnedTime = 9200;
+static const TimeValue kClawAtAWithRobotPinchedTime = 9800;
+
+static const TimeValue kClawAtBTime = 10400;
+static const TimeValue kClawAtBPinchedTime = 11000;
+static const TimeValue kClawAtBTurnedTime = 11600;
+static const TimeValue kClawAtBWithRobotTime = 12200;
+static const TimeValue kClawAtBWithRobotPinchedTime = 12800;
+
+static const TimeValue kClawAtCTime = 13400;
+static const TimeValue kClawAtCPinchedTime = 14000;
+static const TimeValue kClawAtCTurnedTime = 14600;
+
+static const TimeValue kClawAtDTime = 15200;
+static const TimeValue kClawAtDPinchedTime = 15800;
+static const TimeValue kClawAtDTurnedTime = 16400;
+
+static const TimeValue kAToBStart = 17000;
+static const TimeValue kAToBStop = 18680;
+static const TimeValue kAPinchStart = 18680;
+static const TimeValue kAPinchStop = 20200;
+static const TimeValue kACCWStart = 20200;
+static const TimeValue kACCWStop = 21600;
+static const TimeValue kACWStart = 21600;
+static const TimeValue kACWStop = 23000;
+
+static const TimeValue kBToAStart = 23000;
+static const TimeValue kBToAStop = 24680;
+static const TimeValue kBToCStart = 24680;
+static const TimeValue kBToCStop = 26520;
+static const TimeValue kBToDStart = 26520;
+static const TimeValue kBToDStop = 28320;
+static const TimeValue kBPinchStart = 28320;
+static const TimeValue kBPinchStop = 29680;
+static const TimeValue kBCCWStart = 29680;
+static const TimeValue kBCCWStop = 31200;
+static const TimeValue kBCWStart = 31200;
+static const TimeValue kBCWStop = 32720;
+
+static const TimeValue kCToBStart = 32720;
+static const TimeValue kCToBStop = 34560;
+static const TimeValue kCPinchStart = 34560;
+static const TimeValue kCPinchStop = 36400;
+static const TimeValue kCCCWStart = 36400;
+static const TimeValue kCCCWStop = 37840;
+static const TimeValue kCCWStart = 37840;
+static const TimeValue kCCWStop = 39280;
+
+static const TimeValue kDToBStart = 39280;
+static const TimeValue kDToBStop = 41080;
+static const TimeValue kDPinchStart = 41080;
+static const TimeValue kDPinchStop = 42600;
+static const TimeValue kDCCWStart = 42600;
+static const TimeValue kDCCWStop = 44000;
+static const TimeValue kDCWStart = 44000;
+static const TimeValue kDCWStop = 45400;
+
+static const TimeValue kRobotApproachStart = 45400;
+static const TimeValue kRobotApproachStop = 56800;
+
+static const TimeValue kCToBWithRobotStart = 56800;
+static const TimeValue kCToBWithRobotStop = 58600;
+
+static const TimeValue kBPinchWithRobotStart = 58600;
+static const TimeValue kBPinchWithRobotStop = 60400;
+static const TimeValue kBToAWithRobotStart = 60400;
+static const TimeValue kBToAWithRobotStop = 62240;
 
 // As usual, times here are in seconds.
 
 // Left monitor times.
 
-const TimeValue kAlphaSplashStart = 0;
-const TimeValue kAlphaSplashStop = 2;
+static const TimeValue kAlphaSplashStart = 0;
+static const TimeValue kAlphaSplashStop = 2;
 
-const TimeValue kMainMenuTime = 2;
-const TimeValue kLaunchPrepRolloverTime = 3;
-const TimeValue kLaunchPrepHighlightStart = 4;
-const TimeValue kLaunchPrepHighlightStop = 5;
-const TimeValue kClawControlRolloverTime = 5;
-const TimeValue kClawControlHighlightStart = 6;
-const TimeValue kClawControlHighlightStop = 7;
+static const TimeValue kMainMenuTime = 2;
+static const TimeValue kLaunchPrepRolloverTime = 3;
+static const TimeValue kLaunchPrepHighlightStart = 4;
+static const TimeValue kLaunchPrepHighlightStop = 5;
+static const TimeValue kClawControlRolloverTime = 5;
+static const TimeValue kClawControlHighlightStart = 6;
+static const TimeValue kClawControlHighlightStop = 7;
 
-const TimeValue kAlphaLaunchPrepStart = 7;
-const TimeValue kAlphaLaunchPrepStop = 17;
+static const TimeValue kAlphaLaunchPrepStart = 7;
+static const TimeValue kAlphaLaunchPrepStop = 17;
 
-const TimeValue kClawMenuStart = 17;
-const TimeValue kClawMenuStop = 18;
+static const TimeValue kClawMenuStart = 17;
+static const TimeValue kClawMenuStop = 18;
 
-const TimeValue kClawMenuTime = 18;
+static const TimeValue kClawMenuTime = 18;
 
-const TimeValue kDeltaSplashStart = 19;
-const TimeValue kDeltaSplashStop = 21;
+static const TimeValue kDeltaSplashStart = 19;
+static const TimeValue kDeltaSplashStop = 21;
 
-const TimeValue kDeltaLaunchPrepStart = 21;
-const TimeValue kDeltaLaunchPrepStop = 30;
+static const TimeValue kDeltaLaunchPrepStart = 21;
+static const TimeValue kDeltaLaunchPrepStop = 30;
 
 // Right monitor times.
 
-const NotificationFlags kAlphaSplashFinished = 1;
-const NotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1;
-const NotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1;
-const NotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1;
-const NotificationFlags kClawMenuFinished = kClawHighlightFinished << 1;
-const NotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1;
-const NotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1;
+static const NotificationFlags kAlphaSplashFinished = 1;
+static const NotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1;
+static const NotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1;
+static const NotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1;
+static const NotificationFlags kClawMenuFinished = kClawHighlightFinished << 1;
+static const NotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1;
+static const NotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1;
 
-const NotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
+static const NotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
 														kAlphaPrepFinished |
 														kPrepHighlightFinished |
 														kClawHighlightFinished |
@@ -157,9 +157,9 @@ const NotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
 														kDeltaSplashFinished |
 														kDeltaPrepFinished;
 
-const NotificationFlags kOneSecondOfMoveFinished = 1;
+static const NotificationFlags kOneSecondOfMoveFinished = 1;
 
-const NotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished;
+static const NotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished;
 
 enum {
 	kButtonDimFrame,
@@ -307,7 +307,7 @@ enum {
 	kMoveClawUp
 };
 
-const int kClawNowhere = -1;
+static const int kClawNowhere = -1;
 
 // Array indexed by [claw position] [move direction]
 // array yields new claw position or -1.
@@ -415,8 +415,8 @@ enum {
 };
 
 // Sub Control Room button PICTs:
-const ResIDType kSubControlButtonBaseID = 500;
-const ResIDType kClawMonitorGreenBallBaseID = 600;
+static const ResIDType kSubControlButtonBaseID = 500;
+static const ResIDType kClawMonitorGreenBallBaseID = 600;
 
 // Constructor
 SubControlRoom::SubControlRoom(Neighborhood *handler) : GameInteraction(kNoradSubControlRoomInteractionID, handler),