diff options
Diffstat (limited to 'engines/pegasus/neighborhood/norad')
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp | 154 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/constants.h | 1098 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/noradelevator.cpp | 8 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/pressuredoor.cpp | 80 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/pressuredoor.h | 2 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/pressuretracker.h | 6 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/subcontrolroom.cpp | 212 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/subcontrolroom.h | 10 | ||||
| -rwxr-xr-x | engines/pegasus/neighborhood/norad/subplatform.cpp | 30 |
9 files changed, 800 insertions, 800 deletions
diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp index 00cfe71752..61d77bf353 100755 --- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp @@ -32,18 +32,18 @@ namespace Pegasus { -const NotificationFlags kFSPowerUpFinishedFlag = 1; -const NotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1; -const NotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1; -const NotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1; -const NotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1; -const NotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1; -const NotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1; -const NotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1; -const NotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1; -const NotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1; - -const NotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag | +static const NotificationFlags kFSPowerUpFinishedFlag = 1; +static const NotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1; +static const NotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1; +static const NotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1; +static const NotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1; +static const NotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1; +static const NotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1; +static const NotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1; +static const NotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1; +static const NotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1; + +static const NotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag | kFSSplashFinishedFlag | kFSIntakeWarningFinishedFlag | kFSIntakeHiliteFinishedFlag | @@ -54,75 +54,75 @@ const NotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag | kFSOHiliteFinishedFlag | kFSNHiliteFinishedFlag; -const int16 kNoState = 0; -const int16 kMainMenu = 1; -const int16 kWaitingForAttach = 2; -const int16 kDispenseMenu = 3; -const int16 kWaitingForDispense = 4; +static const int16 kNoState = 0; +static const int16 kMainMenu = 1; +static const int16 kWaitingForAttach = 2; +static const int16 kDispenseMenu = 3; +static const int16 kWaitingForDispense = 4; // Dummy itemIDs -const ItemID kCO2Item = 10000; -const ItemID kHeItem = 10001; +static const ItemID kCO2Item = 10000; +static const ItemID kHeItem = 10001; // Interactive points. -const TimeValue kFSPowerUpStartStart = 0; -const TimeValue kFSPowerUpStartStop = 600; -const TimeValue kFSSplashStart = 600; -const TimeValue kFSSplashStop = 7800; -const TimeValue kFSSplashIntakeStart = 7800; -const TimeValue kFSSplashIntakeStop = 18600; - -const TimeValue kFSMainMenu = 18600; -const TimeValue kFSIntakeHiliteStart = 19200; -const TimeValue kFSIntakeHiliteStop = 19800; -const TimeValue kFSDispenseHiliteStart = 19800; -const TimeValue kFSDispenseHiliteStop = 20400; - -const TimeValue kFSDispenseMenu = 20400; - -const TimeValue kFSArHiliteStart = 21000; -const TimeValue kFSArHiliteStop = 21600; -const TimeValue kFSArAttach = 21600; -const TimeValue kFSArFilledStart = 22200; -const TimeValue kFSArFilledStop = 25200; -const TimeValue kFSArIncompatibleStart = 25200; -const TimeValue kFSArIncompatibleStop = 30000; - -const TimeValue kFSCO2HiliteStart = 30000; -const TimeValue kFSCO2HiliteStop = 30600; -const TimeValue kFSCO2Attach = 30600; -const TimeValue kFSCO2FilledStart = 31200; -const TimeValue kFSCO2FilledStop = 34200; -const TimeValue kFSCO2IncompatibleStart = 34200; -const TimeValue kFSCO2IncompatibleStop = 39000; - -const TimeValue kFSHeHiliteStart = 39000; -const TimeValue kFSHeHiliteStop = 39600; -const TimeValue kFSHeAttach = 39600; -const TimeValue kFSHeFilledStart = 40200; -const TimeValue kFSHeFilledStop = 43200; -const TimeValue kFSHeIncompatibleStart = 43200; -const TimeValue kFSHeIncompatibleStop = 48000; - -const TimeValue kFSOHiliteStart = 48000; -const TimeValue kFSOHiliteStop = 48600; -const TimeValue kFSOAttach = 48600; -const TimeValue kFSOFilledStart = 49200; -const TimeValue kFSOFilledStop = 52200; -const TimeValue kFSOIncompatibleStart = 52200; -const TimeValue kFSOIncompatibleStop = 57000; - -const TimeValue kFSNHiliteStart = 57000; -const TimeValue kFSNHiliteStop = 57600; -const TimeValue kFSNAttach = 57600; -const TimeValue kFSNFilledStart = 58200; -const TimeValue kFSNFilledStop = 61200; -const TimeValue kFSNIncompatibleStart = 61200; -const TimeValue kFSNIncompatibleStop = 66000; - -const TimeValue kFSIntakeMenu = 66000; -const TimeValue kFSIntakeInProgressStart = 66600; -const TimeValue kFSIntakeInProgressStop = 69600; +static const TimeValue kFSPowerUpStartStart = 0; +static const TimeValue kFSPowerUpStartStop = 600; +static const TimeValue kFSSplashStart = 600; +static const TimeValue kFSSplashStop = 7800; +static const TimeValue kFSSplashIntakeStart = 7800; +static const TimeValue kFSSplashIntakeStop = 18600; + +static const TimeValue kFSMainMenu = 18600; +static const TimeValue kFSIntakeHiliteStart = 19200; +static const TimeValue kFSIntakeHiliteStop = 19800; +static const TimeValue kFSDispenseHiliteStart = 19800; +static const TimeValue kFSDispenseHiliteStop = 20400; + +static const TimeValue kFSDispenseMenu = 20400; + +static const TimeValue kFSArHiliteStart = 21000; +static const TimeValue kFSArHiliteStop = 21600; +static const TimeValue kFSArAttach = 21600; +static const TimeValue kFSArFilledStart = 22200; +static const TimeValue kFSArFilledStop = 25200; +static const TimeValue kFSArIncompatibleStart = 25200; +static const TimeValue kFSArIncompatibleStop = 30000; + +static const TimeValue kFSCO2HiliteStart = 30000; +static const TimeValue kFSCO2HiliteStop = 30600; +static const TimeValue kFSCO2Attach = 30600; +static const TimeValue kFSCO2FilledStart = 31200; +static const TimeValue kFSCO2FilledStop = 34200; +static const TimeValue kFSCO2IncompatibleStart = 34200; +static const TimeValue kFSCO2IncompatibleStop = 39000; + +static const TimeValue kFSHeHiliteStart = 39000; +static const TimeValue kFSHeHiliteStop = 39600; +static const TimeValue kFSHeAttach = 39600; +static const TimeValue kFSHeFilledStart = 40200; +static const TimeValue kFSHeFilledStop = 43200; +static const TimeValue kFSHeIncompatibleStart = 43200; +static const TimeValue kFSHeIncompatibleStop = 48000; + +static const TimeValue kFSOHiliteStart = 48000; +static const TimeValue kFSOHiliteStop = 48600; +static const TimeValue kFSOAttach = 48600; +static const TimeValue kFSOFilledStart = 49200; +static const TimeValue kFSOFilledStop = 52200; +static const TimeValue kFSOIncompatibleStart = 52200; +static const TimeValue kFSOIncompatibleStop = 57000; + +static const TimeValue kFSNHiliteStart = 57000; +static const TimeValue kFSNHiliteStop = 57600; +static const TimeValue kFSNAttach = 57600; +static const TimeValue kFSNFilledStart = 58200; +static const TimeValue kFSNFilledStop = 61200; +static const TimeValue kFSNIncompatibleStart = 61200; +static const TimeValue kFSNIncompatibleStop = 66000; + +static const TimeValue kFSIntakeMenu = 66000; +static const TimeValue kFSIntakeInProgressStart = 66600; +static const TimeValue kFSIntakeInProgressStop = 69600; NoradAlphaFillingStation::NoradAlphaFillingStation(Neighborhood *owner) : GameInteraction(kNoradFillingStationInteractionID, owner), _rightSideMovie(kN01RightSideID), _rightSideNotification(kNoradFillingStationNotificationID, ((PegasusEngine *)g_engine)) { diff --git a/engines/pegasus/neighborhood/norad/constants.h b/engines/pegasus/neighborhood/norad/constants.h index 92319b899d..e86422a273 100755 --- a/engines/pegasus/neighborhood/norad/constants.h +++ b/engines/pegasus/neighborhood/norad/constants.h @@ -32,723 +32,723 @@ namespace Pegasus { // Norad Alpha spot constants -const TimeValue kAlphaBumpIntoWallIn = 0; -const TimeValue kAlphaBumpIntoWallOut = 303; +static const TimeValue kAlphaBumpIntoWallIn = 0; +static const TimeValue kAlphaBumpIntoWallOut = 303; -const TimeValue kAlphaAccessDeniedIn = 303; -const TimeValue kAlphaAccessDeniedOut = 3045; +static const TimeValue kAlphaAccessDeniedIn = 303; +static const TimeValue kAlphaAccessDeniedOut = 3045; -const TimeValue kAlphaRegDoorCloseIn = 3045; -const TimeValue kAlphaRegDoorCloseOut = 4476; +static const TimeValue kAlphaRegDoorCloseIn = 3045; +static const TimeValue kAlphaRegDoorCloseOut = 4476; -const TimeValue kAlphaElevatorDoorCloseIn = 4476; -const TimeValue kAlphaElevatorDoorCloseOut = 5071; +static const TimeValue kAlphaElevatorDoorCloseIn = 4476; +static const TimeValue kAlphaElevatorDoorCloseOut = 5071; -const TimeValue kAlphaCantTransportIn = 5071; -const TimeValue kAlphaCantTransportOut = 9348; +static const TimeValue kAlphaCantTransportIn = 5071; +static const TimeValue kAlphaCantTransportOut = 9348; -const TimeValue kAlphaPressureDoorIntro1In = 9348; -const TimeValue kAlphaPressureDoorIntro1Out = 11061; +static const TimeValue kAlphaPressureDoorIntro1In = 9348; +static const TimeValue kAlphaPressureDoorIntro1Out = 11061; -const TimeValue kAlphaPressureDoorIntro2In = 11061; -const TimeValue kAlphaPressureDoorIntro2Out = 14098; +static const TimeValue kAlphaPressureDoorIntro2In = 11061; +static const TimeValue kAlphaPressureDoorIntro2Out = 14098; -const TimeValue kN22ReplyIn = 14098; -const TimeValue kN22ReplyOut = 18442; +static const TimeValue kN22ReplyIn = 14098; +static const TimeValue kN22ReplyOut = 18442; -const TimeValue kAlphaLoadClawIntroIn = 18442; -const TimeValue kAlphaLoadClawIntroOut = 20698; +static const TimeValue kAlphaLoadClawIntroIn = 18442; +static const TimeValue kAlphaLoadClawIntroOut = 20698; // Norad Delta spot constants -const TimeValue kDeltaBumpIntoWallIn = 0; -const TimeValue kDeltaBumpIntoWallOut = 303; +static const TimeValue kDeltaBumpIntoWallIn = 0; +static const TimeValue kDeltaBumpIntoWallOut = 303; -const TimeValue kDeltaAccessDeniedIn = 303; -const TimeValue kDeltaAccessDeniedOut = 3045; +static const TimeValue kDeltaAccessDeniedIn = 303; +static const TimeValue kDeltaAccessDeniedOut = 3045; -const TimeValue kDeltaRegDoorCloseIn = 3045; -const TimeValue kDeltaRegDoorCloseOut = 4476; +static const TimeValue kDeltaRegDoorCloseIn = 3045; +static const TimeValue kDeltaRegDoorCloseOut = 4476; -const TimeValue kDeltaElevatorDoorCloseIn = 4476; -const TimeValue kDeltaElevatorDoorCloseOut = 5071; +static const TimeValue kDeltaElevatorDoorCloseIn = 4476; +static const TimeValue kDeltaElevatorDoorCloseOut = 5071; -const TimeValue kPressureDoorIntro1In = 5071; -const TimeValue kPressureDoorIntro1Out = 6784; +static const TimeValue kPressureDoorIntro1In = 5071; +static const TimeValue kPressureDoorIntro1Out = 6784; -const TimeValue kPressureDoorIntro2In = 6784; -const TimeValue kPressureDoorIntro2Out = 9821; +static const TimeValue kPressureDoorIntro2In = 6784; +static const TimeValue kPressureDoorIntro2Out = 9821; -const TimeValue kLoadClawIntroIn = 9821; -const TimeValue kLoadClawIntroOut = 12077; +static const TimeValue kLoadClawIntroIn = 9821; +static const TimeValue kLoadClawIntroOut = 12077; -const TimeValue kHoldForRetinalIn = 12077; -const TimeValue kHoldForRetinalOut = 14104; +static const TimeValue kHoldForRetinalIn = 12077; +static const TimeValue kHoldForRetinalOut = 14104; -const TimeValue kRetinalScanFailedIn = 14104; -const TimeValue kRetinalScanFailedOut = 17538; +static const TimeValue kRetinalScanFailedIn = 14104; +static const TimeValue kRetinalScanFailedOut = 17538; -const TimeValue kAddisAbabaIn = 17538; -const TimeValue kAddisAbabaOut = 19263; +static const TimeValue kAddisAbabaIn = 17538; +static const TimeValue kAddisAbabaOut = 19263; -const TimeValue kBangkokIn = 19263; -const TimeValue kBangkokOut = 20201; +static const TimeValue kBangkokIn = 19263; +static const TimeValue kBangkokOut = 20201; -const TimeValue kBonnIn = 20201; -const TimeValue kBonnOut = 20915; +static const TimeValue kBonnIn = 20201; +static const TimeValue kBonnOut = 20915; -const TimeValue kDublinIn = 20915; -const TimeValue kDublinOut = 21660; +static const TimeValue kDublinIn = 20915; +static const TimeValue kDublinOut = 21660; -const TimeValue kHonoluluIn = 21660; -const TimeValue kHonoluluOut = 22498; +static const TimeValue kHonoluluIn = 21660; +static const TimeValue kHonoluluOut = 22498; -const TimeValue kMadridIn = 22498; -const TimeValue kMadridOut = 23474; +static const TimeValue kMadridIn = 22498; +static const TimeValue kMadridOut = 23474; -const TimeValue kReykjavikIn = 23474; -const TimeValue kReykjavikOut = 24488; +static const TimeValue kReykjavikIn = 23474; +static const TimeValue kReykjavikOut = 24488; -const TimeValue kSanAntonioIn = 24488; -const TimeValue kSanAntonioOut = 25561; +static const TimeValue kSanAntonioIn = 24488; +static const TimeValue kSanAntonioOut = 25561; -const TimeValue kSeoulIn = 25561; -const TimeValue kSeoulOut = 26461; +static const TimeValue kSeoulIn = 25561; +static const TimeValue kSeoulOut = 26461; -const TimeValue kSvortalskIn = 26461; -const TimeValue kSvortalskOut = 27582; +static const TimeValue kSvortalskIn = 26461; +static const TimeValue kSvortalskOut = 27582; -const TimeValue kSiloBeepIn = 27582; -const TimeValue kSiloBeepOut = 27721; +static const TimeValue kSiloBeepIn = 27582; +static const TimeValue kSiloBeepOut = 27721; -const TimeValue kAllSilosDeactivatedIn = 27721; -const TimeValue kAllSilosDeactivatedOut = 28928; +static const TimeValue kAllSilosDeactivatedIn = 27721; +static const TimeValue kAllSilosDeactivatedOut = 28928; -const TimeValue kGlobalLaunchOverrideIn = 28928; -const TimeValue kGlobalLaunchOverrideOut = 30736; +static const TimeValue kGlobalLaunchOverrideIn = 28928; +static const TimeValue kGlobalLaunchOverrideOut = 30736; -const TimeValue kLaunchSiloSelectedIn = 30736; -const TimeValue kLaunchSiloSelectedOut = 31660; +static const TimeValue kLaunchSiloSelectedIn = 30736; +static const TimeValue kLaunchSiloSelectedOut = 31660; -const TimeValue kLaunchToProceedIn = 31660; -const TimeValue kLaunchToProceedOut = 32536; +static const TimeValue kLaunchToProceedIn = 31660; +static const TimeValue kLaunchToProceedOut = 32536; -const TimeValue kMaximumDeactivationIn = 32536; -const TimeValue kMaximumDeactivationOut = 34337; +static const TimeValue kMaximumDeactivationIn = 32536; +static const TimeValue kMaximumDeactivationOut = 34337; -const TimeValue kMissileLaunchedIn = 34337; -const TimeValue kMissileLaunchedOut = 35082; +static const TimeValue kMissileLaunchedIn = 34337; +static const TimeValue kMissileLaunchedOut = 35082; -const TimeValue kNewLaunchSiloIn = 35082; -const TimeValue kNewLaunchSiloOut = 36320; +static const TimeValue kNewLaunchSiloIn = 35082; +static const TimeValue kNewLaunchSiloOut = 36320; -const TimeValue kStrikeAuthorizedIn = 36320; -const TimeValue kStrikeAuthorizedOut = 37393; +static const TimeValue kStrikeAuthorizedIn = 36320; +static const TimeValue kStrikeAuthorizedOut = 37393; -const TimeValue kPrimaryTargetIn = 37393; -const TimeValue kPrimaryTargetOut = 38628; +static const TimeValue kPrimaryTargetIn = 37393; +static const TimeValue kPrimaryTargetOut = 38628; -const TimeValue kSiloDeactivatedIn = 38628; -const TimeValue kSiloDeactivatedOut = 39566; +static const TimeValue kSiloDeactivatedIn = 38628; +static const TimeValue kSiloDeactivatedOut = 39566; -const TimeValue kStrikeCodeRejectedIn = 39566; -const TimeValue kStrikeCodeRejectedOut = 41056; +static const TimeValue kStrikeCodeRejectedIn = 39566; +static const TimeValue kStrikeCodeRejectedOut = 41056; -const TimeValue kToDeactivateIn = 41056; -const TimeValue kToDeactivateOut = 46494; +static const TimeValue kToDeactivateIn = 41056; +static const TimeValue kToDeactivateOut = 46494; -const TimeValue kTwoMinutesIn = 46494; -const TimeValue kTwoMinutesOut = 47166; +static const TimeValue kTwoMinutesIn = 46494; +static const TimeValue kTwoMinutesOut = 47166; -const TimeValue kOneMinuteIn = 47166; -const TimeValue kOneMinuteOut = 47856; +static const TimeValue kOneMinuteIn = 47166; +static const TimeValue kOneMinuteOut = 47856; -const TimeValue kFiftySecondsIn = 47856; -const TimeValue kFiftySecondsOut = 48691; +static const TimeValue kFiftySecondsIn = 47856; +static const TimeValue kFiftySecondsOut = 48691; -const TimeValue kFortySecondsIn = 48691; -const TimeValue kFortySecondsOut = 49500; +static const TimeValue kFortySecondsIn = 48691; +static const TimeValue kFortySecondsOut = 49500; -const TimeValue kThirtySecondsIn = 49500; -const TimeValue kThirtySecondsOut = 50362; +static const TimeValue kThirtySecondsIn = 49500; +static const TimeValue kThirtySecondsOut = 50362; -const TimeValue kTwentySecondsIn = 50362; -const TimeValue kTwentySecondsOut = 51245; +static const TimeValue kTwentySecondsIn = 50362; +static const TimeValue kTwentySecondsOut = 51245; -const TimeValue kTenSecondsIn = 51245; -const TimeValue kTenSecondsOut = 52069; +static const TimeValue kTenSecondsIn = 51245; +static const TimeValue kTenSecondsOut = 52069; -const TimeValue kGiveUpHumanIn = 52069; -const TimeValue kGiveUpHumanOut = 55023; +static const TimeValue kGiveUpHumanIn = 52069; +static const TimeValue kGiveUpHumanOut = 55023; -const TimeValue kIJustBrokeIn = 55023; -const TimeValue kIJustBrokeOut = 59191; +static const TimeValue kIJustBrokeIn = 55023; +static const TimeValue kIJustBrokeOut = 59191; -const TimeValue kTheOnlyGoodHumanIn = 59191; -const TimeValue kTheOnlyGoodHumanOut = 62379; +static const TimeValue kTheOnlyGoodHumanIn = 59191; +static const TimeValue kTheOnlyGoodHumanOut = 62379; -const TimeValue kYouAreRunningIn = 62379; -const TimeValue kYouAreRunningOut = 64201; +static const TimeValue kYouAreRunningIn = 62379; +static const TimeValue kYouAreRunningOut = 64201; -const TimeValue kYouCannotPossiblyIn = 64201; -const TimeValue kYouCannotPossiblyOut = 65740; +static const TimeValue kYouCannotPossiblyIn = 64201; +static const TimeValue kYouCannotPossiblyOut = 65740; -const TimeValue kYouWillFailIn = 65740; -const TimeValue kYouWillFailOut = 67217; +static const TimeValue kYouWillFailIn = 65740; +static const TimeValue kYouWillFailOut = 67217; -const CanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1; +static const CanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1; -const NotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1; +static const NotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1; -const uint16 kNoradWarningVolume = 0x100 / 3; -const uint16 kNoradSuckWindVolume = 0x100 / 2; +static const uint16 kNoradWarningVolume = 0x100 / 3; +static const uint16 kNoradSuckWindVolume = 0x100 / 2; -const int16 kElevatorCompassAngle = -40; -const int16 kSubPlatformCompassAngle = 45; -const int16 kSubControlCompassAngle = -10; +static const int16 kElevatorCompassAngle = -40; +static const int16 kSubPlatformCompassAngle = 45; +static const int16 kSubControlCompassAngle = -10; // Norad interactions. -const InteractionID kNoradGlobeGameInteractionID = 0; -const InteractionID kNoradECRMonitorInteractionID = 1; -const InteractionID kNoradFillingStationInteractionID = 2; -const InteractionID kNoradElevatorInteractionID = 3; -const InteractionID kNoradPressureDoorInteractionID = 4; -const InteractionID kNoradSubControlRoomInteractionID = 5; -const InteractionID kNoradSubPlatformInteractionID = 6; +static const InteractionID kNoradGlobeGameInteractionID = 0; +static const InteractionID kNoradECRMonitorInteractionID = 1; +static const InteractionID kNoradFillingStationInteractionID = 2; +static const InteractionID kNoradElevatorInteractionID = 3; +static const InteractionID kNoradPressureDoorInteractionID = 4; +static const InteractionID kNoradSubControlRoomInteractionID = 5; +static const InteractionID kNoradSubPlatformInteractionID = 6; ///////////////////////////////////////////// // // Norad Alpha -const CoordType kECRSlideShowLeft = kNavAreaLeft + 78; -const CoordType kECRSlideShowTop = kNavAreaTop + 1; +static const CoordType kECRSlideShowLeft = kNavAreaLeft + 78; +static const CoordType kECRSlideShowTop = kNavAreaTop + 1; -const CoordType kECRPanLeft = kNavAreaLeft + 78 + 5; -const CoordType kECRPanTop = kNavAreaTop + 1 + 4; -const CoordType kECRPanRight = kECRPanLeft + 213; -const CoordType kECRPanBottom = kECRPanTop + 241; +static const CoordType kECRPanLeft = kNavAreaLeft + 78 + 5; +static const CoordType kECRPanTop = kNavAreaTop + 1 + 4; +static const CoordType kECRPanRight = kECRPanLeft + 213; +static const CoordType kECRPanBottom = kECRPanTop + 241; -const CoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332; -const CoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127; +static const CoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332; +static const CoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127; -const CoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0; -const CoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0; +static const CoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0; +static const CoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0; -const CoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240; -const CoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12; +static const CoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240; +static const CoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12; -const CoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98; -const CoordType kNoradUpperLevelsTop = kNavAreaTop + 31; +static const CoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98; +static const CoordType kNoradUpperLevelsTop = kNavAreaTop + 31; -const CoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114; -const CoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8; +static const CoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114; +static const CoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8; -const CoordType kNoradUpperUpLeft = kNavAreaLeft + 361; -const CoordType kNoradUpperUpTop = kNavAreaTop + 32; +static const CoordType kNoradUpperUpLeft = kNavAreaLeft + 361; +static const CoordType kNoradUpperUpTop = kNavAreaTop + 32; -const CoordType kNoradUpperDownLeft = kNavAreaLeft + 367; -const CoordType kNoradUpperDownTop = kNavAreaTop + 66; +static const CoordType kNoradUpperDownLeft = kNavAreaLeft + 367; +static const CoordType kNoradUpperDownTop = kNavAreaTop + 66; -const CoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74; -const CoordType kNoradLowerLevelsTop = kNavAreaTop + 157; +static const CoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74; +static const CoordType kNoradLowerLevelsTop = kNavAreaTop + 157; -const CoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144; -const CoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9; +static const CoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144; +static const CoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9; -const CoordType kNoradLowerUpLeft = kNavAreaLeft + 380; -const CoordType kNoradLowerUpTop = kNavAreaTop + 164; +static const CoordType kNoradLowerUpLeft = kNavAreaLeft + 380; +static const CoordType kNoradLowerUpTop = kNavAreaTop + 164; -const CoordType kNoradLowerDownLeft = kNavAreaLeft + 388; -const CoordType kNoradLowerDownTop = kNavAreaTop + 212; +static const CoordType kNoradLowerDownLeft = kNavAreaLeft + 388; +static const CoordType kNoradLowerDownTop = kNavAreaTop + 212; -const CoordType kNoradPlatformLeft = kNavAreaLeft + 36; -const CoordType kNoradPlatformTop = kNavAreaTop + 87; +static const CoordType kNoradPlatformLeft = kNavAreaLeft + 36; +static const CoordType kNoradPlatformTop = kNavAreaTop + 87; -const CoordType kNoradSubControlLeft = kNavAreaLeft + 0; -const CoordType kNoradSubControlTop = kNavAreaTop + 84; +static const CoordType kNoradSubControlLeft = kNavAreaLeft + 0; +static const CoordType kNoradSubControlTop = kNavAreaTop + 84; -const CoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106; -const CoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86; +static const CoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106; +static const CoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86; -const CoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66; -const CoordType kNoradSubControlDownTop = kNoradSubControlTop + 106; +static const CoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66; +static const CoordType kNoradSubControlDownTop = kNoradSubControlTop + 106; -const CoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83; -const CoordType kNoradSubControlRightTop = kNoradSubControlTop + 90; +static const CoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83; +static const CoordType kNoradSubControlRightTop = kNoradSubControlTop + 90; -const CoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56; -const CoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91; +static const CoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56; +static const CoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91; -const CoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66; -const CoordType kNoradSubControlUpTop = kNoradSubControlTop + 81; +static const CoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66; +static const CoordType kNoradSubControlUpTop = kNoradSubControlTop + 81; -const CoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29; -const CoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88; +static const CoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29; +static const CoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88; -const CoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0; -const CoordType kNoradSubControlCWTop = kNoradSubControlTop + 89; +static const CoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0; +static const CoordType kNoradSubControlCWTop = kNoradSubControlTop + 89; -const CoordType kNoradClawMonitorLeft = kNavAreaLeft + 288; -const CoordType kNoradClawMonitorTop = kNavAreaTop + 97; +static const CoordType kNoradClawMonitorLeft = kNavAreaLeft + 288; +static const CoordType kNoradClawMonitorTop = kNavAreaTop + 97; -const CoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179; -const CoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82; +static const CoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179; +static const CoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82; -const CoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130; -const CoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73; +static const CoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130; +static const CoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73; -const CoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110; -const CoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26; +static const CoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110; +static const CoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26; -const CoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21; -const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49; +static const CoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21; +static const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49; ///////////////////////////////////////////// // // Norad Delta -const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360; -const CoordType kGlobeMonitorTop = kNavAreaTop + 144; +static const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360; +static const CoordType kGlobeMonitorTop = kNavAreaTop + 144; -const CoordType kGlobeLeft = kNavAreaLeft + 172; -const CoordType kGlobeTop = kNavAreaTop; +static const CoordType kGlobeLeft = kNavAreaLeft + 172; +static const CoordType kGlobeTop = kNavAreaTop; -const CoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186; -const CoordType kGlobeCircleLeftTop = kNavAreaTop + 41; +static const CoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186; +static const CoordType kGlobeCircleLeftTop = kNavAreaTop + 41; -const CoordType kGlobeCircleRightLeft = kNavAreaLeft + 321; -const CoordType kGlobeCircleRightTop = kNavAreaTop + 41; +static const CoordType kGlobeCircleRightLeft = kNavAreaLeft + 321; +static const CoordType kGlobeCircleRightTop = kNavAreaTop + 41; -const CoordType kGlobeCircleUpLeft = kNavAreaLeft + 220; -const CoordType kGlobeCircleUpTop = kNavAreaTop + 7; +static const CoordType kGlobeCircleUpLeft = kNavAreaLeft + 220; +static const CoordType kGlobeCircleUpTop = kNavAreaTop + 7; -const CoordType kGlobeCircleDownLeft = kNavAreaLeft + 220; -const CoordType kGlobeCircleDownTop = kNavAreaTop + 142; +static const CoordType kGlobeCircleDownLeft = kNavAreaLeft + 220; +static const CoordType kGlobeCircleDownTop = kNavAreaTop + 142; -const CoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207; -const CoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28; +static const CoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207; +static const CoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28; -const CoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307; -const CoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28; +static const CoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307; +static const CoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28; -const CoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207; -const CoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128; +static const CoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207; +static const CoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128; -const CoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307; -const CoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128; +static const CoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307; +static const CoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128; -const CoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182; -const CoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60; +static const CoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182; +static const CoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60; -const CoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331; -const CoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60; +static const CoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331; +static const CoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60; -const CoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239; -const CoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3; +static const CoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239; +static const CoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3; -const CoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239; -const CoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152; +static const CoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239; +static const CoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152; -const CoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368; -const CoordType kGlobeUpperNamesTop = kNavAreaTop + 188; +static const CoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368; +static const CoordType kGlobeUpperNamesTop = kNavAreaTop + 188; -const CoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368; -const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212; +static const CoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368; +static const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212; -const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478; -const CoordType kGlobeCountdownTop = kNavAreaTop + 164; +static const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478; +static const CoordType kGlobeCountdownTop = kNavAreaTop + 164; // Norad Alpha display IDs. -const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID; -const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1; -const DisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1; -const DisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1; -const DisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1; -const DisplayElementID kN01RightSideID = kN01LeftSideID + 1; -const DisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1; -const DisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1; -const DisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1; -const DisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1; -const DisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1; -const DisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1; -const DisplayElementID kClawMonitorID = kSubControlMonitorID + 1; -const DisplayElementID kSubControlPinchID = kClawMonitorID + 1; -const DisplayElementID kSubControlDownID = kSubControlPinchID + 1; -const DisplayElementID kSubControlRightID = kSubControlDownID + 1; -const DisplayElementID kSubControlLeftID = kSubControlRightID + 1; -const DisplayElementID kSubControlUpID = kSubControlLeftID + 1; -const DisplayElementID kSubControlCCWID = kSubControlUpID + 1; -const DisplayElementID kSubControlCWID = kSubControlCCWID + 1; -const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1; +static const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID; +static const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1; +static const DisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1; +static const DisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1; +static const DisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1; +static const DisplayElementID kN01RightSideID = kN01LeftSideID + 1; +static const DisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1; +static const DisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1; +static const DisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1; +static const DisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1; +static const DisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1; +static const DisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1; +static const DisplayElementID kClawMonitorID = kSubControlMonitorID + 1; +static const DisplayElementID kSubControlPinchID = kClawMonitorID + 1; +static const DisplayElementID kSubControlDownID = kSubControlPinchID + 1; +static const DisplayElementID kSubControlRightID = kSubControlDownID + 1; +static const DisplayElementID kSubControlLeftID = kSubControlRightID + 1; +static const DisplayElementID kSubControlUpID = kSubControlLeftID + 1; +static const DisplayElementID kSubControlCCWID = kSubControlUpID + 1; +static const DisplayElementID kSubControlCWID = kSubControlCCWID + 1; +static const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1; // Norad Delta display IDs. -const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID; -const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14; -const DisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1; -const DisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1; -const DisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1; -const DisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1; -const DisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1; -const DisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1; -const DisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1; -const DisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1; -const DisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1; -const DisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1; -const DisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1; -const DisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1; -const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1; -const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1; -const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1; +static const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID; +static const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14; +static const DisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1; +static const DisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1; +static const DisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1; +static const DisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1; +static const DisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1; +static const DisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1; +static const DisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1; +static const DisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1; +static const DisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1; +static const DisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1; +static const DisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1; +static const DisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1; +static const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1; +static const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1; +static const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1; // Norad Alpha: -const DisplayOrder kECRMonitorOrder = kMonitorLayer; -const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1; +static const DisplayOrder kECRMonitorOrder = kMonitorLayer; +static const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1; -const DisplayOrder kN01LeftSideOrder = kMonitorLayer; -const DisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1; +static const DisplayOrder kN01LeftSideOrder = kMonitorLayer; +static const DisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1; -const DisplayOrder kElevatorControlsOrder = kMonitorLayer; +static const DisplayOrder kElevatorControlsOrder = kMonitorLayer; -const DisplayOrder kPressureLevelsOrder = kMonitorLayer; -const DisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1; -const DisplayOrder kPressureUpOrder = kPressureTypeOrder + 1; -const DisplayOrder kPressureDownOrder = kPressureUpOrder + 1; +static const DisplayOrder kPressureLevelsOrder = kMonitorLayer; +static const DisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1; +static const DisplayOrder kPressureUpOrder = kPressureTypeOrder + 1; +static const DisplayOrder kPressureDownOrder = kPressureUpOrder + 1; -const DisplayOrder kPlatformOrder = kMonitorLayer; +static const DisplayOrder kPlatformOrder = kMonitorLayer; -const DisplayOrder kSubControlOrder = kMonitorLayer; -const DisplayOrder kClawMonitorOrder = kSubControlOrder + 1; -const DisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1; -const DisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1; -const DisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1; -const DisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1; -const DisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1; -const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1; -const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1; -const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1; +static const DisplayOrder kSubControlOrder = kMonitorLayer; +static const DisplayOrder kClawMonitorOrder = kSubControlOrder + 1; +static const DisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1; +static const DisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1; +static const DisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1; +static const DisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1; +static const DisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1; +static const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1; +static const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1; +static const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1; // Norad Delta: -const DisplayOrder kGlobeMonitorLayer = kMonitorLayer; -const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1; -const DisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1; -const DisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1; -const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1; -const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1; -const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1; +static const DisplayOrder kGlobeMonitorLayer = kMonitorLayer; +static const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1; +static const DisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1; +static const DisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1; +static const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1; +static const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1; +static const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1; // Norad Alpha Tables -const TimeScale kNoradAlphaMovieScale = 600; -const TimeScale kNoradAlphaFramesPerSecond = 15; -const TimeScale kNoradAlphaFrameDuration = 40; +static const TimeScale kNoradAlphaMovieScale = 600; +static const TimeScale kNoradAlphaFramesPerSecond = 15; +static const TimeScale kNoradAlphaFrameDuration = 40; // Alternate IDs. -const AlternateID kAltNoradAlphaNormal = 0; +static const AlternateID kAltNoradAlphaNormal = 0; // Room IDs. -const RoomID kNorad01 = 0; -const RoomID kNorad01East = 1; -const RoomID kNorad01West = 2; -const RoomID kNorad02 = 3; -const RoomID kNorad03 = 4; -const RoomID kNorad04 = 5; -const RoomID kNorad05 = 6; -const RoomID kNorad06 = 7; -const RoomID kNorad07 = 8; -const RoomID kNorad07North = 9; -const RoomID kNorad08 = 10; -const RoomID kNorad09 = 11; -const RoomID kNorad10 = 12; -const RoomID kNorad10East = 13; -const RoomID kNorad11 = 14; -const RoomID kNorad11South = 15; -const RoomID kNorad12 = 16; -const RoomID kNorad12South = 17; -const RoomID kNorad13 = 18; -const RoomID kNorad14 = 19; -const RoomID kNorad15 = 20; -const RoomID kNorad16 = 21; -const RoomID kNorad17 = 22; -const RoomID kNorad18 = 23; -const RoomID kNorad19 = 24; -const RoomID kNorad19West = 25; -const RoomID kNorad21 = 26; -const RoomID kNorad21West = 27; -const RoomID kNorad22 = 28; -const RoomID kNorad22West = 29; +static const RoomID kNorad01 = 0; +static const RoomID kNorad01East = 1; +static const RoomID kNorad01West = 2; +static const RoomID kNorad02 = 3; +static const RoomID kNorad03 = 4; +static const RoomID kNorad04 = 5; +static const RoomID kNorad05 = 6; +static const RoomID kNorad06 = 7; +static const RoomID kNorad07 = 8; +static const RoomID kNorad07North = 9; +static const RoomID kNorad08 = 10; +static const RoomID kNorad09 = 11; +static const RoomID kNorad10 = 12; +static const RoomID kNorad10East = 13; +static const RoomID kNorad11 = 14; +static const RoomID kNorad11South = 15; +static const RoomID kNorad12 = 16; +static const RoomID kNorad12South = 17; +static const RoomID kNorad13 = 18; +static const RoomID kNorad14 = 19; +static const RoomID kNorad15 = 20; +static const RoomID kNorad16 = 21; +static const RoomID kNorad17 = 22; +static const RoomID kNorad18 = 23; +static const RoomID kNorad19 = 24; +static const RoomID kNorad19West = 25; +static const RoomID kNorad21 = 26; +static const RoomID kNorad21West = 27; +static const RoomID kNorad22 = 28; +static const RoomID kNorad22West = 29; // Hot Spot Activation IDs. // Hot Spot IDs. -const HotSpotID kNorad01ECRSpotID = 5000; -const HotSpotID kNorad01GasSpotID = 5001; -const HotSpotID kNorad01ECROutSpotID = 5002; -const HotSpotID kNorad01GasOutSpotID = 5003; -const HotSpotID kNorad01MonitorSpotID = 5004; -const HotSpotID kNorad01IntakeSpotID = 5005; -const HotSpotID kNorad01DispenseSpotID = 5006; -const HotSpotID kNorad01ArSpotID = 5007; -const HotSpotID kNorad01CO2SpotID = 5008; -const HotSpotID kNorad01HeSpotID = 5009; -const HotSpotID kNorad01OSpotID = 5010; -const HotSpotID kNorad01NSpotID = 5011; -const HotSpotID kN01GasCanisterSpotID = 5012; -const HotSpotID kN01ArgonCanisterSpotID = 5013; -const HotSpotID kN01AirMaskSpotID = 5014; -const HotSpotID kN01NitrogenCanisterSpotID = 5015; -const HotSpotID kN01GasOutletSpotID = 5016; -const HotSpotID kNorad07DoorSpotID = 5017; -const HotSpotID kNorad07DoorOutSpotID = 5018; -const HotSpotID kNorad10DoorSpotID = 5019; -const HotSpotID kNorad10EastOutSpotID = 5020; -const HotSpotID kAlphaUpperPressureDoorUpSpotID = 5021; -const HotSpotID kAlphaUpperPressureDoorDownSpotID = 5022; -const HotSpotID kNorad11ElevatorSpotID = 5023; -const HotSpotID kNorad11ElevatorOutSpotID = 5024; -const HotSpotID kNorad11ElevatorDownSpotID = 5025; -const HotSpotID kNorad12ElevatorSpotID = 5026; -const HotSpotID kNorad12ElevatorOutSpotID = 5027; -const HotSpotID kNorad12ElevatorUpSpotID = 5028; -const HotSpotID kNorad19MonitorSpotID = 5029; -const HotSpotID kNorad19MonitorOutSpotID = 5030; -const HotSpotID kNorad19ActivateMonitorSpotID = 5031; -const HotSpotID kNorad21WestSpotID = 5032; -const HotSpotID kNorad21WestOutSpotID = 5033; -const HotSpotID kAlphaLowerPressureDoorUpSpotID = 5034; -const HotSpotID kAlphaLowerPressureDoorDownSpotID = 5035; -const HotSpotID kNorad22MonitorSpotID = 5036; -const HotSpotID kNorad22MonitorOutSpotID = 5037; -const HotSpotID kNorad22LaunchPrepSpotID = 5038; -const HotSpotID kNorad22ClawControlSpotID = 5039; -const HotSpotID kNorad22ClawPinchSpotID = 5040; -const HotSpotID kNorad22ClawDownSpotID = 5041; -const HotSpotID kNorad22ClawRightSpotID = 5042; -const HotSpotID kNorad22ClawLeftSpotID = 5043; -const HotSpotID kNorad22ClawUpSpotID = 5044; -const HotSpotID kNorad22ClawCCWSpotID = 5045; -const HotSpotID kNorad22ClawCWSpotID = 5046; +static const HotSpotID kNorad01ECRSpotID = 5000; +static const HotSpotID kNorad01GasSpotID = 5001; +static const HotSpotID kNorad01ECROutSpotID = 5002; +static const HotSpotID kNorad01GasOutSpotID = 5003; +static const HotSpotID kNorad01MonitorSpotID = 5004; +static const HotSpotID kNorad01IntakeSpotID = 5005; +static const HotSpotID kNorad01DispenseSpotID = 5006; +static const HotSpotID kNorad01ArSpotID = 5007; +static const HotSpotID kNorad01CO2SpotID = 5008; +static const HotSpotID kNorad01HeSpotID = 5009; +static const HotSpotID kNorad01OSpotID = 5010; +static const HotSpotID kNorad01NSpotID = 5011; +static const HotSpotID kN01GasCanisterSpotID = 5012; +static const HotSpotID kN01ArgonCanisterSpotID = 5013; +static const HotSpotID kN01AirMaskSpotID = 5014; +static const HotSpotID kN01NitrogenCanisterSpotID = 5015; +static const HotSpotID kN01GasOutletSpotID = 5016; +static const HotSpotID kNorad07DoorSpotID = 5017; +static const HotSpotID kNorad07DoorOutSpotID = 5018; +static const HotSpotID kNorad10DoorSpotID = 5019; +static const HotSpotID kNorad10EastOutSpotID = 5020; +static const HotSpotID kAlphaUpperPressureDoorUpSpotID = 5021; +static const HotSpotID kAlphaUpperPressureDoorDownSpotID = 5022; +static const HotSpotID kNorad11ElevatorSpotID = 5023; +static const HotSpotID kNorad11ElevatorOutSpotID = 5024; +static const HotSpotID kNorad11ElevatorDownSpotID = 5025; +static const HotSpotID kNorad12ElevatorSpotID = 5026; +static const HotSpotID kNorad12ElevatorOutSpotID = 5027; +static const HotSpotID kNorad12ElevatorUpSpotID = 5028; +static const HotSpotID kNorad19MonitorSpotID = 5029; +static const HotSpotID kNorad19MonitorOutSpotID = 5030; +static const HotSpotID kNorad19ActivateMonitorSpotID = 5031; +static const HotSpotID kNorad21WestSpotID = 5032; +static const HotSpotID kNorad21WestOutSpotID = 5033; +static const HotSpotID kAlphaLowerPressureDoorUpSpotID = 5034; +static const HotSpotID kAlphaLowerPressureDoorDownSpotID = 5035; +static const HotSpotID kNorad22MonitorSpotID = 5036; +static const HotSpotID kNorad22MonitorOutSpotID = 5037; +static const HotSpotID kNorad22LaunchPrepSpotID = 5038; +static const HotSpotID kNorad22ClawControlSpotID = 5039; +static const HotSpotID kNorad22ClawPinchSpotID = 5040; +static const HotSpotID kNorad22ClawDownSpotID = 5041; +static const HotSpotID kNorad22ClawRightSpotID = 5042; +static const HotSpotID kNorad22ClawLeftSpotID = 5043; +static const HotSpotID kNorad22ClawUpSpotID = 5044; +static const HotSpotID kNorad22ClawCCWSpotID = 5045; +static const HotSpotID kNorad22ClawCWSpotID = 5046; // Extra sequence IDs. -const ExtraID kNoradArriveFromTSA = 0; -const ExtraID kNorad01RobotTaunt = 1; -const ExtraID kNorad01ZoomInWithGasCanister = 2; -const ExtraID kN01WGasCanister = 3; -const ExtraID kNorad01ZoomOutWithGasCanister = 4; -const ExtraID kN01WZEmptyLit = 5; -const ExtraID kN01WZGasCanisterDim = 6; -const ExtraID kN01WZGasCanisterLit = 7; -const ExtraID kN01WZArgonCanisterDim = 8; -const ExtraID kN01WZArgonCanisterLit = 9; -const ExtraID kN01WZAirMaskDim = 10; -const ExtraID kN01WZAirMaskLit = 11; -const ExtraID kN01WZNitrogenCanisterDim = 12; -const ExtraID kN01WZNitrogenCanisterLit = 13; -const ExtraID kNorad04EastDeath = 14; -const ExtraID kNorad19PrepSub = 15; -const ExtraID kNorad19ExitToSub = 16; -const ExtraID kNorad22SouthIntro = 17; -const ExtraID kNorad22SouthReply = 18; -const ExtraID kNorad22SouthFinish = 19; -const ExtraID kN22ClawFromAToB = 20; -const ExtraID kN22ClawALoop = 21; -const ExtraID kN22ClawAPinch = 22; -const ExtraID kN22ClawACounterclockwise = 23; -const ExtraID kN22ClawAClockwise = 24; -const ExtraID kN22ClawFromBToA = 25; -const ExtraID kN22ClawFromBToC = 26; -const ExtraID kN22ClawFromBToD = 27; -const ExtraID kN22ClawBLoop = 28; -const ExtraID kN22ClawBPinch = 29; -const ExtraID kN22ClawBCounterclockwise = 30; -const ExtraID kN22ClawBClockwise = 31; -const ExtraID kN22ClawFromCToB = 32; -const ExtraID kN22ClawCLoop = 33; -const ExtraID kN22ClawCPinch = 34; -const ExtraID kN22ClawCCounterclockwise = 35; -const ExtraID kN22ClawCClockwise = 36; -const ExtraID kN22ClawFromDToB = 37; -const ExtraID kN22ClawDLoop = 38; -const ExtraID kN22ClawDPinch = 39; -const ExtraID kN22ClawDCounterclockwise = 40; -const ExtraID kN22ClawDClockwise = 41; +static const ExtraID kNoradArriveFromTSA = 0; +static const ExtraID kNorad01RobotTaunt = 1; +static const ExtraID kNorad01ZoomInWithGasCanister = 2; +static const ExtraID kN01WGasCanister = 3; +static const ExtraID kNorad01ZoomOutWithGasCanister = 4; +static const ExtraID kN01WZEmptyLit = 5; +static const ExtraID kN01WZGasCanisterDim = 6; +static const ExtraID kN01WZGasCanisterLit = 7; +static const ExtraID kN01WZArgonCanisterDim = 8; +static const ExtraID kN01WZArgonCanisterLit = 9; +static const ExtraID kN01WZAirMaskDim = 10; +static const ExtraID kN01WZAirMaskLit = 11; +static const ExtraID kN01WZNitrogenCanisterDim = 12; +static const ExtraID kN01WZNitrogenCanisterLit = 13; +static const ExtraID kNorad04EastDeath = 14; +static const ExtraID kNorad19PrepSub = 15; +static const ExtraID kNorad19ExitToSub = 16; +static const ExtraID kNorad22SouthIntro = 17; +static const ExtraID kNorad22SouthReply = 18; +static const ExtraID kNorad22SouthFinish = 19; +static const ExtraID kN22ClawFromAToB = 20; +static const ExtraID kN22ClawALoop = 21; +static const ExtraID kN22ClawAPinch = 22; +static const ExtraID kN22ClawACounterclockwise = 23; +static const ExtraID kN22ClawAClockwise = 24; +static const ExtraID kN22ClawFromBToA = 25; +static const ExtraID kN22ClawFromBToC = 26; +static const ExtraID kN22ClawFromBToD = 27; +static const ExtraID kN22ClawBLoop = 28; +static const ExtraID kN22ClawBPinch = 29; +static const ExtraID kN22ClawBCounterclockwise = 30; +static const ExtraID kN22ClawBClockwise = 31; +static const ExtraID kN22ClawFromCToB = 32; +static const ExtraID kN22ClawCLoop = 33; +static const ExtraID kN22ClawCPinch = 34; +static const ExtraID kN22ClawCCounterclockwise = 35; +static const ExtraID kN22ClawCClockwise = 36; +static const ExtraID kN22ClawFromDToB = 37; +static const ExtraID kN22ClawDLoop = 38; +static const ExtraID kN22ClawDPinch = 39; +static const ExtraID kN22ClawDCounterclockwise = 40; +static const ExtraID kN22ClawDClockwise = 41; // Norad Delta Extra sequence IDs. -const ExtraID kArriveFromSubChase = 0; -const ExtraID kN59ZoomWithRobot = 1; -const ExtraID kN59RobotApproaches = 2; -const ExtraID kN59RobotPunchLoop = 3; -const ExtraID kN59PlayerWins1 = 4; -const ExtraID kN59PlayerWins2 = 5; -const ExtraID kN59RobotWins = 6; -const ExtraID kN59RobotHeadOpens = 7; -const ExtraID kN59Biochips111 = 8; -const ExtraID kN59Biochips011 = 9; -const ExtraID kN59Biochips101 = 10; -const ExtraID kN59Biochips001 = 11; -const ExtraID kN59Biochips110 = 12; -const ExtraID kN59Biochips010 = 13; -const ExtraID kN59Biochips100 = 14; -const ExtraID kN59Biochips000 = 15; -const ExtraID kN59RobotDisappears = 16; -const ExtraID kN60ClawFromAToB = 17; -const ExtraID kN60ClawALoop = 18; -const ExtraID kN60ClawAPinch = 19; -const ExtraID kN60ClawACounterclockwise = 20; -const ExtraID kN60ClawAClockwise = 21; -const ExtraID kN60ClawFromBToA = 22; -const ExtraID kN60ClawFromBToC = 23; -const ExtraID kN60ClawFromBToD = 24; -const ExtraID kN60ClawBLoop = 25; -const ExtraID kN60ClawBPinch = 26; -const ExtraID kN60ClawBCounterclockwise = 27; -const ExtraID kN60ClawBClockwise = 28; -const ExtraID kN60ClawFromCToB = 29; -const ExtraID kN60ClawCLoop = 30; -const ExtraID kN60ClawCPinch = 31; -const ExtraID kN60ClawCCounterclockwise = 32; -const ExtraID kN60ClawCClockwise = 33; -const ExtraID kN60ClawFromDToB = 34; -const ExtraID kN60ClawDLoop = 35; -const ExtraID kN60ClawDPinch = 36; -const ExtraID kN60ClawDCounterclockwise = 37; -const ExtraID kN60ClawDClockwise = 38; -const ExtraID kN60RobotApproaches = 39; -const ExtraID kN60FirstMistake = 40; -const ExtraID kN60ArmActivated = 41; -const ExtraID kN60SecondMistake = 42; -const ExtraID kN60ArmToPositionB = 43; -const ExtraID kN60ThirdMistake = 44; -const ExtraID kN60ArmGrabsRobot = 45; -const ExtraID kN60FourthMistake = 46; -const ExtraID kN60ArmCarriesRobotToPositionA = 47; -const ExtraID kN60PlayerFollowsRobotToDoor = 48; -const ExtraID kN60RobotHeadOpens = 49; -const ExtraID kN60Biochips111 = 50; -const ExtraID kN60Biochips011 = 51; -const ExtraID kN60Biochips101 = 52; -const ExtraID kN60Biochips001 = 53; -const ExtraID kN60Biochips110 = 54; -const ExtraID kN60Biochips010 = 55; -const ExtraID kN60Biochips100 = 56; -const ExtraID kN60Biochips000 = 57; -const ExtraID kN60RobotDisappears = 58; -const ExtraID kNoradDeltaRetinalScanBad = 59; -const ExtraID kNoradDeltaRetinalScanGood = 60; -const ExtraID kN79BrightView = 61; +static const ExtraID kArriveFromSubChase = 0; +static const ExtraID kN59ZoomWithRobot = 1; +static const ExtraID kN59RobotApproaches = 2; +static const ExtraID kN59RobotPunchLoop = 3; +static const ExtraID kN59PlayerWins1 = 4; +static const ExtraID kN59PlayerWins2 = 5; +static const ExtraID kN59RobotWins = 6; +static const ExtraID kN59RobotHeadOpens = 7; +static const ExtraID kN59Biochips111 = 8; +static const ExtraID kN59Biochips011 = 9; +static const ExtraID kN59Biochips101 = 10; +static const ExtraID kN59Biochips001 = 11; +static const ExtraID kN59Biochips110 = 12; +static const ExtraID kN59Biochips010 = 13; +static const ExtraID kN59Biochips100 = 14; +static const ExtraID kN59Biochips000 = 15; +static const ExtraID kN59RobotDisappears = 16; +static const ExtraID kN60ClawFromAToB = 17; +static const ExtraID kN60ClawALoop = 18; +static const ExtraID kN60ClawAPinch = 19; +static const ExtraID kN60ClawACounterclockwise = 20; +static const ExtraID kN60ClawAClockwise = 21; +static const ExtraID kN60ClawFromBToA = 22; +static const ExtraID kN60ClawFromBToC = 23; +static const ExtraID kN60ClawFromBToD = 24; +static const ExtraID kN60ClawBLoop = 25; +static const ExtraID kN60ClawBPinch = 26; +static const ExtraID kN60ClawBCounterclockwise = 27; +static const ExtraID kN60ClawBClockwise = 28; +static const ExtraID kN60ClawFromCToB = 29; +static const ExtraID kN60ClawCLoop = 30; +static const ExtraID kN60ClawCPinch = 31; +static const ExtraID kN60ClawCCounterclockwise = 32; +static const ExtraID kN60ClawCClockwise = 33; +static const ExtraID kN60ClawFromDToB = 34; +static const ExtraID kN60ClawDLoop = 35; +static const ExtraID kN60ClawDPinch = 36; +static const ExtraID kN60ClawDCounterclockwise = 37; +static const ExtraID kN60ClawDClockwise = 38; +static const ExtraID kN60RobotApproaches = 39; +static const ExtraID kN60FirstMistake = 40; +static const ExtraID kN60ArmActivated = 41; +static const ExtraID kN60SecondMistake = 42; +static const ExtraID kN60ArmToPositionB = 43; +static const ExtraID kN60ThirdMistake = 44; +static const ExtraID kN60ArmGrabsRobot = 45; +static const ExtraID kN60FourthMistake = 46; +static const ExtraID kN60ArmCarriesRobotToPositionA = 47; +static const ExtraID kN60PlayerFollowsRobotToDoor = 48; +static const ExtraID kN60RobotHeadOpens = 49; +static const ExtraID kN60Biochips111 = 50; +static const ExtraID kN60Biochips011 = 51; +static const ExtraID kN60Biochips101 = 52; +static const ExtraID kN60Biochips001 = 53; +static const ExtraID kN60Biochips110 = 54; +static const ExtraID kN60Biochips010 = 55; +static const ExtraID kN60Biochips100 = 56; +static const ExtraID kN60Biochips000 = 57; +static const ExtraID kN60RobotDisappears = 58; +static const ExtraID kNoradDeltaRetinalScanBad = 59; +static const ExtraID kNoradDeltaRetinalScanGood = 60; +static const ExtraID kN79BrightView = 61; // Norad Delta Tables -const TimeScale kNoradDeltaMovieScale = 600; -const TimeScale kNoradDeltaFramesPerSecond = 15; -const TimeScale kNoradDeltaFrameDuration = 40; +static const TimeScale kNoradDeltaMovieScale = 600; +static const TimeScale kNoradDeltaFramesPerSecond = 15; +static const TimeScale kNoradDeltaFrameDuration = 40; // Alternate IDs. -const AlternateID kAltNoradDeltaNormal = 0; +static const AlternateID kAltNoradDeltaNormal = 0; // Room IDs. -const RoomID kNorad41 = 0; -const RoomID kNorad42 = 1; -const RoomID kNorad43 = 2; -const RoomID kNorad44 = 3; -const RoomID kNorad45 = 4; -const RoomID kNorad46 = 5; -const RoomID kNorad47 = 6; -const RoomID kNorad48 = 7; -const RoomID kNorad48South = 8; -const RoomID kNorad49 = 9; -const RoomID kNorad49South = 10; -const RoomID kNorad50 = 11; -const RoomID kNorad50East = 12; -const RoomID kNorad51 = 13; -const RoomID kNorad52 = 14; -const RoomID kNorad53 = 15; -const RoomID kNorad54 = 16; -const RoomID kNorad54North = 17; -const RoomID kNorad55 = 18; -const RoomID kNorad56 = 19; -const RoomID kNorad57 = 20; -const RoomID kNorad58 = 21; -const RoomID kNorad59 = 22; -const RoomID kNorad59West = 23; -const RoomID kNorad60 = 24; -const RoomID kNorad60West = 25; -const RoomID kNorad61 = 26; -const RoomID kNorad62 = 27; -const RoomID kNorad63 = 28; -const RoomID kNorad64 = 29; -const RoomID kNorad65 = 30; -const RoomID kNorad66 = 31; -const RoomID kNorad67 = 32; -const RoomID kNorad68 = 33; -const RoomID kNorad68West = 34; -const RoomID kNorad69 = 35; -const RoomID kNorad78 = 36; -const RoomID kNorad79 = 37; -const RoomID kNorad79West = 38; +static const RoomID kNorad41 = 0; +static const RoomID kNorad42 = 1; +static const RoomID kNorad43 = 2; +static const RoomID kNorad44 = 3; +static const RoomID kNorad45 = 4; +static const RoomID kNorad46 = 5; +static const RoomID kNorad47 = 6; +static const RoomID kNorad48 = 7; +static const RoomID kNorad48South = 8; +static const RoomID kNorad49 = 9; +static const RoomID kNorad49South = 10; +static const RoomID kNorad50 = 11; +static const RoomID kNorad50East = 12; +static const RoomID kNorad51 = 13; +static const RoomID kNorad52 = 14; +static const RoomID kNorad53 = 15; +static const RoomID kNorad54 = 16; +static const RoomID kNorad54North = 17; +static const RoomID kNorad55 = 18; +static const RoomID kNorad56 = 19; +static const RoomID kNorad57 = 20; +static const RoomID kNorad58 = 21; +static const RoomID kNorad59 = 22; +static const RoomID kNorad59West = 23; +static const RoomID kNorad60 = 24; +static const RoomID kNorad60West = 25; +static const RoomID kNorad61 = 26; +static const RoomID kNorad62 = 27; +static const RoomID kNorad63 = 28; +static const RoomID kNorad64 = 29; +static const RoomID kNorad65 = 30; +static const RoomID kNorad66 = 31; +static const RoomID kNorad67 = 32; +static const RoomID kNorad68 = 33; +static const RoomID kNorad68West = 34; +static const RoomID kNorad69 = 35; +static const RoomID kNorad78 = 36; +static const RoomID kNorad79 = 37; +static const RoomID kNorad79West = 38; // Hot Spot Activation IDs. // Hot Spot IDs. -const HotSpotID kNorad48ElevatorSpotID = 5000; -const HotSpotID kNorad48ElevatorOutSpotID = 5001; -const HotSpotID kNorad48ElevatorUpSpotID = 5002; -const HotSpotID kNorad49ElevatorSpotID = 5003; -const HotSpotID kNorad49ElevatorOutSpotID = 5004; -const HotSpotID kNorad49ElevatorDownSpotID = 5005; -const HotSpotID kNorad50DoorSpotID = 5006; -const HotSpotID kNorad50DoorOutSpotID = 5007; -const HotSpotID kDeltaUpperPressureDoorUpSpotID = 5008; -const HotSpotID kDeltaUpperPressureDoorDownSpotID = 5009; -const HotSpotID kNorad54DoorSpotID = 5010; -const HotSpotID kNorad54DoorOutSpotID = 5011; -const HotSpotID kNorad59WestSpotID = 5012; -const HotSpotID kNorad59WestOutSpotID = 5013; -const HotSpotID kDeltaLowerPressureDoorUpSpotID = 5014; -const HotSpotID kDeltaLowerPressureDoorDownSpotID = 5015; -const HotSpotID kDelta59RobotHeadSpotID = 5016; -const HotSpotID kDelta59RobotShieldBiochipSpotID = 5017; -const HotSpotID kDelta59RobotOpMemBiochipSpotID = 5018; -const HotSpotID kDelta59RobotRetinalBiochipSpotID = 5019; -const HotSpotID kNorad60MonitorSpotID = 5020; -const HotSpotID kNorad60MonitorOutSpotID = 5021; -const HotSpotID kNorad60LaunchPrepSpotID = 5022; -const HotSpotID kNorad60ClawControlSpotID = 5023; -const HotSpotID kNorad60ClawPinchSpotID = 5024; -const HotSpotID kNorad60ClawDownSpotID = 5025; -const HotSpotID kNorad60ClawRightSpotID = 5026; -const HotSpotID kNorad60ClawLeftSpotID = 5027; -const HotSpotID kNorad60ClawUpSpotID = 5028; -const HotSpotID kNorad60ClawCCWSpotID = 5029; -const HotSpotID kNorad60ClawCWSpotID = 5030; -const HotSpotID kDelta60RobotHeadSpotID = 5031; -const HotSpotID kDelta60RobotShieldBiochipSpotID = 5032; -const HotSpotID kDelta60RobotOpMemBiochipSpotID = 5033; -const HotSpotID kDelta60RobotRetinalBiochipSpotID = 5034; -const HotSpotID kNorad68WestSpotID = 5035; -const HotSpotID kNorad68WestOutSpotID = 5036; -const HotSpotID kNorad79WestSpotID = 5037; -const HotSpotID kNorad79WestOutSpotID = 5038; -const HotSpotID kNorad79SpinLeftSpotID = 5039; -const HotSpotID kNorad79SpinRightSpotID = 5040; -const HotSpotID kNorad79SpinUpSpotID = 5041; -const HotSpotID kNorad79SpinDownSpotID = 5042; -const HotSpotID kNorad79SiloAreaSpotID = 5043; +static const HotSpotID kNorad48ElevatorSpotID = 5000; +static const HotSpotID kNorad48ElevatorOutSpotID = 5001; +static const HotSpotID kNorad48ElevatorUpSpotID = 5002; +static const HotSpotID kNorad49ElevatorSpotID = 5003; +static const HotSpotID kNorad49ElevatorOutSpotID = 5004; +static const HotSpotID kNorad49ElevatorDownSpotID = 5005; +static const HotSpotID kNorad50DoorSpotID = 5006; +static const HotSpotID kNorad50DoorOutSpotID = 5007; +static const HotSpotID kDeltaUpperPressureDoorUpSpotID = 5008; +static const HotSpotID kDeltaUpperPressureDoorDownSpotID = 5009; +static const HotSpotID kNorad54DoorSpotID = 5010; +static const HotSpotID kNorad54DoorOutSpotID = 5011; +static const HotSpotID kNorad59WestSpotID = 5012; +static const HotSpotID kNorad59WestOutSpotID = 5013; +static const HotSpotID kDeltaLowerPressureDoorUpSpotID = 5014; +static const HotSpotID kDeltaLowerPressureDoorDownSpotID = 5015; +static const HotSpotID kDelta59RobotHeadSpotID = 5016; +static const HotSpotID kDelta59RobotShieldBiochipSpotID = 5017; +static const HotSpotID kDelta59RobotOpMemBiochipSpotID = 5018; +static const HotSpotID kDelta59RobotRetinalBiochipSpotID = 5019; +static const HotSpotID kNorad60MonitorSpotID = 5020; +static const HotSpotID kNorad60MonitorOutSpotID = 5021; +static const HotSpotID kNorad60LaunchPrepSpotID = 5022; +static const HotSpotID kNorad60ClawControlSpotID = 5023; +static const HotSpotID kNorad60ClawPinchSpotID = 5024; +static const HotSpotID kNorad60ClawDownSpotID = 5025; +static const HotSpotID kNorad60ClawRightSpotID = 5026; +static const HotSpotID kNorad60ClawLeftSpotID = 5027; +static const HotSpotID kNorad60ClawUpSpotID = 5028; +static const HotSpotID kNorad60ClawCCWSpotID = 5029; +static const HotSpotID kNorad60ClawCWSpotID = 5030; +static const HotSpotID kDelta60RobotHeadSpotID = 5031; +static const HotSpotID kDelta60RobotShieldBiochipSpotID = 5032; +static const HotSpotID kDelta60RobotOpMemBiochipSpotID = 5033; +static const HotSpotID kDelta60RobotRetinalBiochipSpotID = 5034; +static const HotSpotID kNorad68WestSpotID = 5035; +static const HotSpotID kNorad68WestOutSpotID = 5036; +static const HotSpotID kNorad79WestSpotID = 5037; +static const HotSpotID kNorad79WestOutSpotID = 5038; +static const HotSpotID kNorad79SpinLeftSpotID = 5039; +static const HotSpotID kNorad79SpinRightSpotID = 5040; +static const HotSpotID kNorad79SpinUpSpotID = 5041; +static const HotSpotID kNorad79SpinDownSpotID = 5042; +static const HotSpotID kNorad79SiloAreaSpotID = 5043; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/noradelevator.cpp b/engines/pegasus/neighborhood/norad/noradelevator.cpp index f3f1e1ce38..4279e236ae 100755 --- a/engines/pegasus/neighborhood/norad/noradelevator.cpp +++ b/engines/pegasus/neighborhood/norad/noradelevator.cpp @@ -32,10 +32,10 @@ namespace Pegasus { // Norad elevator PICTs: -const ResIDType kElevatorLabelID = 200; -const ResIDType kElevatorButtonsID = 201; -const ResIDType kElevatorDownOnID = 202; -const ResIDType kElevatorUpOnID = 203; +static const ResIDType kElevatorLabelID = 200; +static const ResIDType kElevatorButtonsID = 201; +static const ResIDType kElevatorDownOnID = 202; +static const ResIDType kElevatorUpOnID = 203; NoradElevator::NoradElevator(Neighborhood *handler, const RoomID upRoom, const RoomID downRoom, const HotSpotID upHotspot, const HotSpotID downHotspot) : GameInteraction(kNoradElevatorInteractionID, handler), diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.cpp b/engines/pegasus/neighborhood/norad/pressuredoor.cpp index 3675f4373b..520d568b5d 100755 --- a/engines/pegasus/neighborhood/norad/pressuredoor.cpp +++ b/engines/pegasus/neighborhood/norad/pressuredoor.cpp @@ -33,32 +33,32 @@ namespace Pegasus { -const TimeValue kLevelsSplashStart = 0; -const TimeValue kLevelsSplashStop = 1; -const TimeValue kPressureBase = 1; - -const TimeValue kDoorSealedTime = 0; -const TimeValue kEqualizeTime = 1; -const TimeValue kMaxPressureLoopStart = 2; -const TimeValue kMaxPressureLoopStop = 3; -const TimeValue kOpeningDoorLoopStart = 3; -const TimeValue kOpeningDoorLoopStop = 4; -const TimeValue kIncreasingPressureTime = 4; -const TimeValue kDecreasingPressureTime = 5; -const TimeValue kCautionLoopStart = 6; -const TimeValue kCautionLoopStop = 7; - -const NotificationFlags kSplashFinished = 1; -const NotificationFlags kPressureDroppingFlag = kSplashFinished << 1; - -const NotificationFlags kPressureNotificationFlags = kSplashFinished | +static const TimeValue kLevelsSplashStart = 0; +static const TimeValue kLevelsSplashStop = 1; +static const TimeValue kPressureBase = 1; + +static const TimeValue kDoorSealedTime = 0; +static const TimeValue kEqualizeTime = 1; +static const TimeValue kMaxPressureLoopStart = 2; +static const TimeValue kMaxPressureLoopStop = 3; +static const TimeValue kOpeningDoorLoopStart = 3; +static const TimeValue kOpeningDoorLoopStop = 4; +static const TimeValue kIncreasingPressureTime = 4; +static const TimeValue kDecreasingPressureTime = 5; +static const TimeValue kCautionLoopStart = 6; +static const TimeValue kCautionLoopStop = 7; + +static const NotificationFlags kSplashFinished = 1; +static const NotificationFlags kPressureDroppingFlag = kSplashFinished << 1; + +static const NotificationFlags kPressureNotificationFlags = kSplashFinished | kPressureDroppingFlag; -const NotificationFlags kDoorJumpsUpFlag = 1; -const NotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1; -const NotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1; +static const NotificationFlags kDoorJumpsUpFlag = 1; +static const NotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1; +static const NotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1; -const NotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag | +static const NotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag | kDoorJumpsBackFlag | kDoorCrushedFlag; @@ -82,27 +82,27 @@ enum { }; // Pressure values range from 0 to 11. -const short kMinPressure = 0; -const short kMaxPressure = 11; +static const short kMinPressure = 0; +static const short kMaxPressure = 11; -const TimeScale kNavTimeScale = 600; -const TimeValue kNavFrameRate = 15; -const TimeValue kNavTimePerFrame = kNavTimeScale / kNavFrameRate; +static const TimeScale kNavTimeScale = 600; +static const TimeValue kNavFrameRate = 15; +static const TimeValue kNavTimePerFrame = kNavTimeScale / kNavFrameRate; -const TimeValue kApproachPunchInTime = 122 * kNavTimePerFrame; -const TimeValue kLoopPunchInTime = 38 * kNavTimePerFrame; -const TimeValue kPunchThroughTime = 38 * kNavTimePerFrame; +static const TimeValue kApproachPunchInTime = 122 * kNavTimePerFrame; +static const TimeValue kLoopPunchInTime = 38 * kNavTimePerFrame; +static const TimeValue kPunchThroughTime = 38 * kNavTimePerFrame; // Pressure door PICTs: -const ResIDType kUpperPressureUpOffPICTID = 400; -const ResIDType kUpperPressureUpOnPICTID = 401; -const ResIDType kUpperPressureDownOffPICTID = 402; -const ResIDType kUpperPressureDownOnPICTID = 403; - -const ResIDType kLowerPressureUpOffPICTID = 404; -const ResIDType kLowerPressureUpOnPICTID = 405; -const ResIDType kLowerPressureDownOffPICTID = 406; -const ResIDType kLowerPressureDownOnPICTID = 407; +static const ResIDType kUpperPressureUpOffPICTID = 400; +static const ResIDType kUpperPressureUpOnPICTID = 401; +static const ResIDType kUpperPressureDownOffPICTID = 402; +static const ResIDType kUpperPressureDownOnPICTID = 403; + +static const ResIDType kLowerPressureUpOffPICTID = 404; +static const ResIDType kLowerPressureUpOnPICTID = 405; +static const ResIDType kLowerPressureDownOffPICTID = 406; +static const ResIDType kLowerPressureDownOnPICTID = 407; PressureDoor::PressureDoor(Neighborhood *handler, bool isUpperDoor, const HotSpotID upSpotID, const HotSpotID downSpotID, const HotSpotID outSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn, diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.h b/engines/pegasus/neighborhood/norad/pressuredoor.h index 5ae8c9b53a..7ef1518c9f 100755 --- a/engines/pegasus/neighborhood/norad/pressuredoor.h +++ b/engines/pegasus/neighborhood/norad/pressuredoor.h @@ -33,7 +33,7 @@ namespace Pegasus { -const short kNormalSubRoomPressure = 2; +static const short kNormalSubRoomPressure = 2; class PressureDoor : public GameInteraction, public NotificationReceiver { public: diff --git a/engines/pegasus/neighborhood/norad/pressuretracker.h b/engines/pegasus/neighborhood/norad/pressuretracker.h index 39ce1c1a8c..7d572593d0 100755 --- a/engines/pegasus/neighborhood/norad/pressuretracker.h +++ b/engines/pegasus/neighborhood/norad/pressuretracker.h @@ -33,12 +33,12 @@ namespace Pegasus { // This class assumes that the globe movie is built at 15 frames per second with a // time scale of 600, yielding 40 time unit per frame. -typedef enum { +enum PressureTrackDirection { kTrackPressureUp, kTrackPressureDown -} tPressureTrackDirection; +}; -const int kPressureDoorTrackInterval = 45; +static const int kPressureDoorTrackInterval = 45; class PressureDoor; class Sprite; 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), diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.h b/engines/pegasus/neighborhood/norad/subcontrolroom.h index e7ee84929a..3ee729b302 100755 --- a/engines/pegasus/neighborhood/norad/subcontrolroom.h +++ b/engines/pegasus/neighborhood/norad/subcontrolroom.h @@ -31,12 +31,12 @@ namespace Pegasus { -const uint32 kClawAtA = 0; -const uint32 kClawAtB = 1; -const uint32 kClawAtC = 2; -const uint32 kClawAtD = 3; +static const uint32 kClawAtA = 0; +static const uint32 kClawAtB = 1; +static const uint32 kClawAtC = 2; +static const uint32 kClawAtD = 3; -const int kNumClawButtons = 7; +static const int kNumClawButtons = 7; class Norad; diff --git a/engines/pegasus/neighborhood/norad/subplatform.cpp b/engines/pegasus/neighborhood/norad/subplatform.cpp index 7f1df535b5..bfe93ea22c 100755 --- a/engines/pegasus/neighborhood/norad/subplatform.cpp +++ b/engines/pegasus/neighborhood/norad/subplatform.cpp @@ -35,30 +35,30 @@ namespace Pegasus { // As usual, times here are in seconds. -const TimeValue kNormalSplashStart = 0; -const TimeValue kNormalSplashStop = 5; +static const TimeValue kNormalSplashStart = 0; +static const TimeValue kNormalSplashStop = 5; -const TimeValue kPrepSubStart = 5; -const TimeValue kPrepSubStop = 15; +static const TimeValue kPrepSubStart = 5; +static const TimeValue kPrepSubStop = 15; -const TimeValue kPrepIncompleteStart = 15; -const TimeValue kPrepIncompleteStop = 19; +static const TimeValue kPrepIncompleteStart = 15; +static const TimeValue kPrepIncompleteStop = 19; -const TimeValue kDamagedStart = 19; -const TimeValue kDamagedStop = 28; +static const TimeValue kDamagedStart = 19; +static const TimeValue kDamagedStop = 28; -const NotificationFlags kNormalSplashFinished = 1; -const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; -const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; -const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; +static const NotificationFlags kNormalSplashFinished = 1; +static const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; +static const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; +static const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; -const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | +static const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | kPrepSubFinished | kPrepIncompleteFinished | kDamagedFinished; -const uint16 kSubPreppedBit = (1 << 0); -const uint16 kWaitingForPlayerBit = (1 << 1); +static const uint16 kSubPreppedBit = (1 << 0); +static const uint16 kWaitingForPlayerBit = (1 << 1); SubPlatform::SubPlatform(Neighborhood *handler) : GameInteraction(kNoradSubPlatformInteractionID, handler), _platformMovie(kPlatformMonitorID), _platformNotification(kNoradSubPlatformNotificationID, (PegasusEngine *)g_engine) { |