diff options
| author | Matthew Hoops | 2011-12-16 23:24:55 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-16 23:24:55 -0500 |
| commit | f72884cb7bbe594888f6d14a3e03c7839ef2c508 (patch) | |
| tree | 14df52c836810a427fcfdacfa71e2d54ea301a33 | |
| parent | 12efb47b536d2f663c9cde2739a1fd40599da669 (diff) | |
| download | scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.tar.gz scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.tar.bz2 scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.zip | |
PEGASUS: Cleanup some constants
Added missing static qualifiers, get rid of some short/long
41 files changed, 3613 insertions, 3615 deletions
diff --git a/engines/pegasus/constants.h b/engines/pegasus/constants.h index e98ebd0997..eb9a8abe67 100755 --- a/engines/pegasus/constants.h +++ b/engines/pegasus/constants.h @@ -35,209 +35,209 @@ namespace Pegasus { // TODO: Organize these -const GameID kGameIDNothing = -1; +static const GameID kGameIDNothing = -1; -const ActorID kNoActorID = kGameIDNothing; -const ActorID kPlayerID = 0; -const ItemID kNoItemID = kGameIDNothing; -const RoomID kNoRoomID = kGameIDNothing; -const ExtraID kNoExtraID = 0xFFFFFFFF; -const NeighborhoodID kNoNeighborhoodID = kGameIDNothing; -const AlternateID kNoAlternateID = 0; -const GameMenuCommand kMenuCmdNoCommand = 0; +static const ActorID kNoActorID = kGameIDNothing; +static const ActorID kPlayerID = 0; +static const ItemID kNoItemID = kGameIDNothing; +static const RoomID kNoRoomID = kGameIDNothing; +static const ExtraID kNoExtraID = 0xFFFFFFFF; +static const NeighborhoodID kNoNeighborhoodID = kGameIDNothing; +static const AlternateID kNoAlternateID = 0; +static const GameMenuCommand kMenuCmdNoCommand = 0; -const HotSpotActivationID kActivateHotSpotAlways = 0; -const HotSpotActivationID kActivateHotSpotNever = -1; +static const HotSpotActivationID kActivateHotSpotAlways = 0; +static const HotSpotActivationID kActivateHotSpotNever = -1; -const ItemState kNoItemState = -1; +static const ItemState kNoItemState = -1; -const DirectionConstant kNoDirection = 0xFF; +static const DirectionConstant kNoDirection = 0xFF; static const DirectionConstant kNorth = 0; static const DirectionConstant kSouth = 1; static const DirectionConstant kEast = 2; static const DirectionConstant kWest = 3; -const TurnDirection kNoTurn = 0xFF; -const TurnDirection kTurnLeft = 0; -const TurnDirection kTurnRight = 1; -const TurnDirection kTurnUp = 2; -const TurnDirection kTurnDown = 3; -const TurnDirection kMaxTurns = 4; +static const TurnDirection kNoTurn = 0xFF; +static const TurnDirection kTurnLeft = 0; +static const TurnDirection kTurnRight = 1; +static const TurnDirection kTurnUp = 2; +static const TurnDirection kTurnDown = 3; +static const TurnDirection kMaxTurns = 4; -const GameMode kNoMode = -1; -const GameMode kModeNavigation = 0; -const GameMode kLastGameShellMode = kModeNavigation; +static const GameMode kNoMode = -1; +static const GameMode kModeNavigation = 0; +static const GameMode kLastGameShellMode = kModeNavigation; -const CanMoveForwardReason kCanMoveForward = 0; -const CanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1; -const CanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1; -const CanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1; -const CanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked; +static const CanMoveForwardReason kCanMoveForward = 0; +static const CanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1; +static const CanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1; +static const CanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1; +static const CanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked; -const CanTurnReason kCanTurn = 0; -const CanTurnReason kCantTurnNoTurn = kCanTurn + 1; -const CanTurnReason kCantTurnLastReason = kCantTurnNoTurn; +static const CanTurnReason kCanTurn = 0; +static const CanTurnReason kCantTurnNoTurn = kCanTurn + 1; +static const CanTurnReason kCantTurnLastReason = kCantTurnNoTurn; -const CanOpenDoorReason kCanOpenDoor = 0; -const CanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1; -const CanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1; -const CanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1; -const CanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen; +static const CanOpenDoorReason kCanOpenDoor = 0; +static const CanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1; +static const CanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1; +static const CanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1; +static const CanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen; -const DisplayElementID kNoDisplayElement = -1; -const DisplayElementID kHighestReservedElementID = -2; +static const DisplayElementID kNoDisplayElement = -1; +static const DisplayElementID kHighestReservedElementID = -2; -const DisplayElementID kCursorID = kHighestReservedElementID; -const DisplayElementID kLoadScreenID = kCursorID - 1; +static const DisplayElementID kCursorID = kHighestReservedElementID; +static const DisplayElementID kLoadScreenID = kCursorID - 1; -const DisplayOrder kMinAvailableOrder = 0; -const DisplayOrder kMaxAvailableOrder = 999998; -const DisplayOrder kLoadScreenOrder = 900000; -const DisplayOrder kCursorOrder = 1000000; +static const DisplayOrder kMinAvailableOrder = 0; +static const DisplayOrder kMaxAvailableOrder = 999998; +static const DisplayOrder kLoadScreenOrder = 900000; +static const DisplayOrder kCursorOrder = 1000000; -const HotSpotID kNoHotSpotID = -1; -const HotSpotFlags kNoHotSpotFlags = 0; -const HotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags; +static const HotSpotID kNoHotSpotID = -1; +static const HotSpotFlags kNoHotSpotFlags = 0; +static const HotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags; -const NotificationFlags kNoNotificationFlags = 0; +static const NotificationFlags kNoNotificationFlags = 0; -const DisplayElementID kCurrentDragSpriteID = 1000; +static const DisplayElementID kCurrentDragSpriteID = 1000; -const TimeScale kDefaultTimeScale = 600; +static const TimeScale kDefaultTimeScale = 600; // Ticks per second. -const TimeScale kOneTickPerSecond = 1; -const TimeScale kTwoTicksPerSecond = 2; -const TimeScale kFifteenTicksPerSecond = 15; -const TimeScale kThirtyTicksPerSecond = 30; -const TimeScale kSixtyTicksPerSecond = 60; -const TimeScale kMovieTicksPerSecond = 600; +static const TimeScale kOneTickPerSecond = 1; +static const TimeScale kTwoTicksPerSecond = 2; +static const TimeScale kFifteenTicksPerSecond = 15; +static const TimeScale kThirtyTicksPerSecond = 30; +static const TimeScale kSixtyTicksPerSecond = 60; +static const TimeScale kMovieTicksPerSecond = 600; // These times are in seconds. -const TimeValue kOneSecond = 1; -const TimeValue kTwoSeconds = 2; -const TimeValue kThreeSeconds = 3; -const TimeValue kFourSeconds = 4; -const TimeValue kFiveSeconds = 5; -const TimeValue kSixSeconds = 6; -const TimeValue kSevenSeconds = 7; -const TimeValue kEightSeconds = 8; -const TimeValue kNineSeconds = 9; -const TimeValue kTenSeconds = 10; -const TimeValue kElevenSeconds = 11; -const TimeValue kTwelveSeconds = 12; -const TimeValue kThirteenSeconds = 13; -const TimeValue kFourteenSeconds = 14; -const TimeValue kFifteenSeconds = 15; -const TimeValue kSixteenSeconds = 16; -const TimeValue kSeventeenSeconds = 17; -const TimeValue kEighteenSeconds = 18; -const TimeValue kNineteenSeconds = 19; -const TimeValue kTwentySeconds = 20; -const TimeValue kThirtySeconds = 30; -const TimeValue kFortySeconds = 40; -const TimeValue kFiftySeconds = 50; -const TimeValue kSixtySeconds = 60; -const TimeValue kOneMinute = 60; -const TimeValue kTwoMinutes = kOneMinute * 2; -const TimeValue kThreeMinutes = kOneMinute * 3; -const TimeValue kFourMinutes = kOneMinute * 4; -const TimeValue kFiveMinutes = kOneMinute * 5; -const TimeValue kSixMinutes = kOneMinute * 6; -const TimeValue kSevenMinutes = kOneMinute * 7; -const TimeValue kEightMinutes = kOneMinute * 8; -const TimeValue kNineMinutes = kOneMinute * 9; -const TimeValue kTenMinutes = kOneMinute * 10; -const TimeValue kElevenMinutes = kOneMinute * 11; -const TimeValue kTwelveMinutes = kOneMinute * 12; -const TimeValue kThirteenMinutes = kOneMinute * 13; -const TimeValue kFourteenMinutes = kOneMinute * 14; -const TimeValue kFifteenMinutes = kOneMinute * 15; -const TimeValue kSixteenMinutes = kOneMinute * 16; -const TimeValue kSeventeenMinutes = kOneMinute * 17; -const TimeValue kEighteenMinutes = kOneMinute * 18; -const TimeValue kNineteenMinutes = kOneMinute * 19; -const TimeValue kTwentyMinutes = kOneMinute * 20; -const TimeValue kThirtyMinutes = kOneMinute * 30; -const TimeValue kFortyMinutes = kOneMinute * 40; -const TimeValue kFiftyMinutes = kOneMinute * 50; -const TimeValue kOneHour = kOneMinute * 60; -const TimeValue kTwoHours = kOneHour * 2; +static const TimeValue kOneSecond = 1; +static const TimeValue kTwoSeconds = 2; +static const TimeValue kThreeSeconds = 3; +static const TimeValue kFourSeconds = 4; +static const TimeValue kFiveSeconds = 5; +static const TimeValue kSixSeconds = 6; +static const TimeValue kSevenSeconds = 7; +static const TimeValue kEightSeconds = 8; +static const TimeValue kNineSeconds = 9; +static const TimeValue kTenSeconds = 10; +static const TimeValue kElevenSeconds = 11; +static const TimeValue kTwelveSeconds = 12; +static const TimeValue kThirteenSeconds = 13; +static const TimeValue kFourteenSeconds = 14; +static const TimeValue kFifteenSeconds = 15; +static const TimeValue kSixteenSeconds = 16; +static const TimeValue kSeventeenSeconds = 17; +static const TimeValue kEighteenSeconds = 18; +static const TimeValue kNineteenSeconds = 19; +static const TimeValue kTwentySeconds = 20; +static const TimeValue kThirtySeconds = 30; +static const TimeValue kFortySeconds = 40; +static const TimeValue kFiftySeconds = 50; +static const TimeValue kSixtySeconds = 60; +static const TimeValue kOneMinute = 60; +static const TimeValue kTwoMinutes = kOneMinute * 2; +static const TimeValue kThreeMinutes = kOneMinute * 3; +static const TimeValue kFourMinutes = kOneMinute * 4; +static const TimeValue kFiveMinutes = kOneMinute * 5; +static const TimeValue kSixMinutes = kOneMinute * 6; +static const TimeValue kSevenMinutes = kOneMinute * 7; +static const TimeValue kEightMinutes = kOneMinute * 8; +static const TimeValue kNineMinutes = kOneMinute * 9; +static const TimeValue kTenMinutes = kOneMinute * 10; +static const TimeValue kElevenMinutes = kOneMinute * 11; +static const TimeValue kTwelveMinutes = kOneMinute * 12; +static const TimeValue kThirteenMinutes = kOneMinute * 13; +static const TimeValue kFourteenMinutes = kOneMinute * 14; +static const TimeValue kFifteenMinutes = kOneMinute * 15; +static const TimeValue kSixteenMinutes = kOneMinute * 16; +static const TimeValue kSeventeenMinutes = kOneMinute * 17; +static const TimeValue kEighteenMinutes = kOneMinute * 18; +static const TimeValue kNineteenMinutes = kOneMinute * 19; +static const TimeValue kTwentyMinutes = kOneMinute * 20; +static const TimeValue kThirtyMinutes = kOneMinute * 30; +static const TimeValue kFortyMinutes = kOneMinute * 40; +static const TimeValue kFiftyMinutes = kOneMinute * 50; +static const TimeValue kOneHour = kOneMinute * 60; +static const TimeValue kTwoHours = kOneHour * 2; // Common times. -const TimeValue kHalfSecondPerTwoTicks = kTwoTicksPerSecond / 2; -const TimeValue kHalfSecondPerThirtyTicks = kThirtyTicksPerSecond / 2; -const TimeValue kHalfSecondPerSixtyTicks = kSixtyTicksPerSecond / 2; +static const TimeValue kHalfSecondPerTwoTicks = kTwoTicksPerSecond / 2; +static const TimeValue kHalfSecondPerThirtyTicks = kThirtyTicksPerSecond / 2; +static const TimeValue kHalfSecondPerSixtyTicks = kSixtyTicksPerSecond / 2; -const TimeValue kOneSecondPerTwoTicks = kTwoTicksPerSecond; -const TimeValue kOneSecondPerThirtyTicks = kThirtyTicksPerSecond; -const TimeValue kOneSecondPerSixtyTicks = kSixtyTicksPerSecond; +static const TimeValue kOneSecondPerTwoTicks = kTwoTicksPerSecond; +static const TimeValue kOneSecondPerThirtyTicks = kThirtyTicksPerSecond; +static const TimeValue kOneSecondPerSixtyTicks = kSixtyTicksPerSecond; -const TimeValue kOneMinutePerFifteenTicks = kOneMinute * kFifteenTicksPerSecond; -const TimeValue kFiveMinutesPerFifteenTicks = kFiveMinutes * kFifteenTicksPerSecond; -const TimeValue kTenMinutesPerFifteenTicks = kTenMinutes * kFifteenTicksPerSecond; +static const TimeValue kOneMinutePerFifteenTicks = kOneMinute * kFifteenTicksPerSecond; +static const TimeValue kFiveMinutesPerFifteenTicks = kFiveMinutes * kFifteenTicksPerSecond; +static const TimeValue kTenMinutesPerFifteenTicks = kTenMinutes * kFifteenTicksPerSecond; -const TimeValue kOneMinutePerThirtyTicks = kOneMinute * kThirtyTicksPerSecond; -const TimeValue kFiveMinutesPerThirtyTicks = kFiveMinutes * kThirtyTicksPerSecond; -const TimeValue kTenMinutesPerThirtyTicks = kTenMinutes * kThirtyTicksPerSecond; +static const TimeValue kOneMinutePerThirtyTicks = kOneMinute * kThirtyTicksPerSecond; +static const TimeValue kFiveMinutesPerThirtyTicks = kFiveMinutes * kThirtyTicksPerSecond; +static const TimeValue kTenMinutesPerThirtyTicks = kTenMinutes * kThirtyTicksPerSecond; -const TimeValue kOneMinutePerSixtyTicks = kOneMinute * kSixtyTicksPerSecond; -const TimeValue kFiveMinutesPerSixtyTicks = kFiveMinutes * kSixtyTicksPerSecond; -const TimeValue kTenMinutesPerSixtyTicks = kTenMinutes * kSixtyTicksPerSecond; +static const TimeValue kOneMinutePerSixtyTicks = kOneMinute * kSixtyTicksPerSecond; +static const TimeValue kFiveMinutesPerSixtyTicks = kFiveMinutes * kSixtyTicksPerSecond; +static const TimeValue kTenMinutesPerSixtyTicks = kTenMinutes * kSixtyTicksPerSecond; // Time in seconds you can hang around Caldoria without going to work... -const TimeValue kLateWarning2TimeLimit = kFiveMinutes; -const TimeValue kLateWarning3TimeLimit = kTenMinutes; - -const TimeValue kSinclairShootsTimeLimit = kThreeMinutes; -const TimeValue kCardBombCountDownTime = kTwelveSeconds; - -const TimeValue kOxyMaskFullTime = kThirtyMinutes; - -const TimeValue kTSAUncreatedTimeLimit = kFiveMinutes; -const TimeValue kRipTimeLimit = kTenMinutesPerFifteenTicks; -const TimeScale kRipTimeScale = kFifteenTicksPerSecond; - -const TimeValue kIntroTimeOut = kThirtySeconds; - -const TimeValue kMarsRobotPatienceLimit = kFifteenSeconds; -const TimeValue kLockFreezeTimeLmit = kFifteenSeconds; -const TimeValue kSpaceChaseTimeLimit = kTenMinutes; -const TimeValue kVacuumSurvivalTimeLimit = kThirtySeconds; -const TimeValue kColorMatchingTimeLimit = kFourMinutes; -const TimeScale kJunkTimeScale = kFifteenTicksPerSecond; -const TimeValue kJunkDropBaseTime = kFiveSeconds; -const TimeValue kJunkDropSlopTime = kThreeSeconds; -const TimeValue kJunkTravelTime = kTenSeconds * kJunkTimeScale; -const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale; -const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale; - -const TimeValue kGawkAtRobotTime = kTenSeconds; -const TimeValue kGawkAtRobotTime2 = kThirteenSeconds; -const TimeValue kPlasmaImpactTime = kTwoSeconds; - -const TimeValue kNoradAirMaskTimeLimit = kOneMinute + kFifteenSeconds; - -const NotificationID kNeighborhoodNotificationID = 1; -const NotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID; - -const NotificationFlags kNeighborhoodMovieCompletedFlag = 1; -const NotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1; -const NotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1; -const NotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1; -const NotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1; -const NotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1; -const NotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1; -const NotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1; -const NotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1; -const NotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1; -const NotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1; -const NotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag; - -const NotificationFlags kNeighborhoodFlags = kNeighborhoodMovieCompletedFlag | +static const TimeValue kLateWarning2TimeLimit = kFiveMinutes; +static const TimeValue kLateWarning3TimeLimit = kTenMinutes; + +static const TimeValue kSinclairShootsTimeLimit = kThreeMinutes; +static const TimeValue kCardBombCountDownTime = kTwelveSeconds; + +static const TimeValue kOxyMaskFullTime = kThirtyMinutes; + +static const TimeValue kTSAUncreatedTimeLimit = kFiveMinutes; +static const TimeValue kRipTimeLimit = kTenMinutesPerFifteenTicks; +static const TimeScale kRipTimeScale = kFifteenTicksPerSecond; + +static const TimeValue kIntroTimeOut = kThirtySeconds; + +static const TimeValue kMarsRobotPatienceLimit = kFifteenSeconds; +static const TimeValue kLockFreezeTimeLmit = kFifteenSeconds; +static const TimeValue kSpaceChaseTimeLimit = kTenMinutes; +static const TimeValue kVacuumSurvivalTimeLimit = kThirtySeconds; +static const TimeValue kColorMatchingTimeLimit = kFourMinutes; +static const TimeScale kJunkTimeScale = kFifteenTicksPerSecond; +static const TimeValue kJunkDropBaseTime = kFiveSeconds; +static const TimeValue kJunkDropSlopTime = kThreeSeconds; +static const TimeValue kJunkTravelTime = kTenSeconds * kJunkTimeScale; +static const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale; +static const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale; + +static const TimeValue kGawkAtRobotTime = kTenSeconds; +static const TimeValue kGawkAtRobotTime2 = kThirteenSeconds; +static const TimeValue kPlasmaImpactTime = kTwoSeconds; + +static const TimeValue kNoradAirMaskTimeLimit = kOneMinute + kFifteenSeconds; + +static const NotificationID kNeighborhoodNotificationID = 1; +static const NotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID; + +static const NotificationFlags kNeighborhoodMovieCompletedFlag = 1; +static const NotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1; +static const NotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1; +static const NotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1; +static const NotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1; +static const NotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1; +static const NotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1; +static const NotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1; +static const NotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1; +static const NotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1; +static const NotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1; +static const NotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag; + +static const NotificationFlags kNeighborhoodFlags = kNeighborhoodMovieCompletedFlag | kMoveForwardCompletedFlag | kStrideCompletedFlag | kTurnCompletedFlag | @@ -249,163 +249,163 @@ const NotificationFlags kNeighborhoodFlags = kNeighborhoodMovieCompletedFlag | kActionRequestCompletedFlag | kDeathExtraCompletedFlag; -const uint32 kPegasusPrimeCreator = MKTAG('J', 'P', 'P', 'P'); -const uint32 kPegasusPrimeContinueType = MKTAG('P', 'P', 'C', 'T'); +static const uint32 kPegasusPrimeCreator = MKTAG('J', 'P', 'P', 'P'); +static const uint32 kPegasusPrimeContinueType = MKTAG('P', 'P', 'C', 'T'); -const uint32 kPegasusPrimeDisk1GameType = MKTAG('P', 'P', 'G', '1'); -const uint32 kPegasusPrimeDisk2GameType = MKTAG('P', 'P', 'G', '2'); -const uint32 kPegasusPrimeDisk3GameType = MKTAG('P', 'P', 'G', '3'); -const uint32 kPegasusPrimeDisk4GameType = MKTAG('P', 'P', 'G', '4'); +static const uint32 kPegasusPrimeDisk1GameType = MKTAG('P', 'P', 'G', '1'); +static const uint32 kPegasusPrimeDisk2GameType = MKTAG('P', 'P', 'G', '2'); +static const uint32 kPegasusPrimeDisk3GameType = MKTAG('P', 'P', 'G', '3'); +static const uint32 kPegasusPrimeDisk4GameType = MKTAG('P', 'P', 'G', '4'); // We only support one of the save versions; the rest are from betas // and we are not supporting them. -const uint32 kPegasusPrimeVersion = 0x00009019; +static const uint32 kPegasusPrimeVersion = 0x00009019; -const char kNormalSave = 0; -const char kContinueSave = 1; +static const char kNormalSave = 0; +static const char kContinueSave = 1; // Display IDs. -const DisplayElementID kNavMovieID = 1; -const DisplayElementID kTurnPushID = 2; +static const DisplayElementID kNavMovieID = 1; +static const DisplayElementID kTurnPushID = 2; -const DisplayElementID kMaxGameShellDisplayID = kTurnPushID; +static const DisplayElementID kMaxGameShellDisplayID = kTurnPushID; // Display ordering. -const DisplayOrder kNavLayer = 10000; -const DisplayOrder kNavMovieOrder = kNavLayer; -const DisplayOrder kTurnPushOrder = kNavMovieOrder + 1; +static const DisplayOrder kNavLayer = 10000; +static const DisplayOrder kNavMovieOrder = kNavLayer; +static const DisplayOrder kTurnPushOrder = kNavMovieOrder + 1; ///////////////////////////////////////////// // // Display IDs. -const DisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1; -const DisplayElementID kInterface1ID = kScreenDimmerID + 1; -const DisplayElementID kInterface2ID = kInterface1ID + 1; -const DisplayElementID kInterface3ID = kInterface2ID + 1; -const DisplayElementID kInterface4ID = kInterface3ID + 1; -const DisplayElementID kDateID = kInterface4ID + 1; -const DisplayElementID kCompassID = kDateID + 1; -const DisplayElementID kInventoryPushID = kCompassID + 1; -const DisplayElementID kInventoryLidID = kInventoryPushID + 1; -const DisplayElementID kBiochipPushID = kInventoryLidID + 1; -const DisplayElementID kBiochipLidID = kBiochipPushID + 1; -const DisplayElementID kEnergyBarID = kBiochipLidID + 1; -const DisplayElementID kWarningLightID = kEnergyBarID + 1; -const DisplayElementID kAILeftAreaID = kWarningLightID + 1; -const DisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1; -const DisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1; -const DisplayElementID kAIMovieID = kAIRightAreaID + 1; -const DisplayElementID kInventoryDropHighlightID = kAIMovieID + 1; -const DisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1; +static const DisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1; +static const DisplayElementID kInterface1ID = kScreenDimmerID + 1; +static const DisplayElementID kInterface2ID = kInterface1ID + 1; +static const DisplayElementID kInterface3ID = kInterface2ID + 1; +static const DisplayElementID kInterface4ID = kInterface3ID + 1; +static const DisplayElementID kDateID = kInterface4ID + 1; +static const DisplayElementID kCompassID = kDateID + 1; +static const DisplayElementID kInventoryPushID = kCompassID + 1; +static const DisplayElementID kInventoryLidID = kInventoryPushID + 1; +static const DisplayElementID kBiochipPushID = kInventoryLidID + 1; +static const DisplayElementID kBiochipLidID = kBiochipPushID + 1; +static const DisplayElementID kEnergyBarID = kBiochipLidID + 1; +static const DisplayElementID kWarningLightID = kEnergyBarID + 1; +static const DisplayElementID kAILeftAreaID = kWarningLightID + 1; +static const DisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1; +static const DisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1; +static const DisplayElementID kAIMovieID = kAIRightAreaID + 1; +static const DisplayElementID kInventoryDropHighlightID = kAIMovieID + 1; +static const DisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1; -const DisplayElementID kDraggingSpriteID = 1000; +static const DisplayElementID kDraggingSpriteID = 1000; -const DisplayElementID kCroppedMovieID = 2000; +static const DisplayElementID kCroppedMovieID = 2000; -const DisplayElementID kNeighborhoodDisplayID = 3000; +static const DisplayElementID kNeighborhoodDisplayID = 3000; -const DisplayElementID kItemPictureBaseID = 5000; +static const DisplayElementID kItemPictureBaseID = 5000; -const CoordType kNavAreaLeft = 64; -const CoordType kNavAreaTop = 64; +static const CoordType kNavAreaLeft = 64; +static const CoordType kNavAreaTop = 64; -const CoordType kBackground1Left = 0; -const CoordType kBackground1Top = 64; +static const CoordType kBackground1Left = 0; +static const CoordType kBackground1Top = 64; -const CoordType kBackground2Left = 0; -const CoordType kBackground2Top = 0; +static const CoordType kBackground2Left = 0; +static const CoordType kBackground2Top = 0; -const CoordType kBackground3Left = 576; -const CoordType kBackground3Top = 64; +static const CoordType kBackground3Left = 576; +static const CoordType kBackground3Top = 64; -const CoordType kBackground4Left = 0; -const CoordType kBackground4Top = 320; +static const CoordType kBackground4Left = 0; +static const CoordType kBackground4Top = 320; -const CoordType kOverviewControllerLeft = 540; -const CoordType kOverviewControllerTop = 348; +static const CoordType kOverviewControllerLeft = 540; +static const CoordType kOverviewControllerTop = 348; -const CoordType kSwapLeft = 194; -const CoordType kSwapTop = 116; +static const CoordType kSwapLeft = 194; +static const CoordType kSwapTop = 116; -const CoordType kSwapHiliteLeft = 200; -const CoordType kSwapHiliteTop = 206; +static const CoordType kSwapHiliteLeft = 200; +static const CoordType kSwapHiliteTop = 206; -const CoordType kDateLeft = 136; -const CoordType kDateTop = 44; +static const CoordType kDateLeft = 136; +static const CoordType kDateTop = 44; -const CoordType kCompassLeft = 222; -const CoordType kCompassTop = 42; -const CoordType kCompassWidth = 92; +static const CoordType kCompassLeft = 222; +static const CoordType kCompassTop = 42; +static const CoordType kCompassWidth = 92; -const CoordType kInventoryPushLeft = 74; -const CoordType kInventoryPushTop = 92; +static const CoordType kInventoryPushLeft = 74; +static const CoordType kInventoryPushTop = 92; -const CoordType kInventoryLidLeft = 74; -const CoordType kInventoryLidTop = 316; +static const CoordType kInventoryLidLeft = 74; +static const CoordType kInventoryLidTop = 316; -const CoordType kBiochipPushLeft = 362; -const CoordType kBiochipPushTop = 192; +static const CoordType kBiochipPushLeft = 362; +static const CoordType kBiochipPushTop = 192; -const CoordType kBiochipLidLeft = 362; -const CoordType kBiochipLidTop = 316; +static const CoordType kBiochipLidLeft = 362; +static const CoordType kBiochipLidTop = 316; -const CoordType kInventoryDropLeft = 0; -const CoordType kInventoryDropTop = 320; -const CoordType kInventoryDropRight = 232; -const CoordType kInventoryDropBottom = 480; +static const CoordType kInventoryDropLeft = 0; +static const CoordType kInventoryDropTop = 320; +static const CoordType kInventoryDropRight = 232; +static const CoordType kInventoryDropBottom = 480; -const CoordType kBiochipDropLeft = 302; -const CoordType kBiochipDropTop = 320; -const CoordType kBiochipDropRight = 640; -const CoordType kBiochipDropBottom = 480; +static const CoordType kBiochipDropLeft = 302; +static const CoordType kBiochipDropTop = 320; +static const CoordType kBiochipDropRight = 640; +static const CoordType kBiochipDropBottom = 480; -const CoordType kFinalMessageLeft = kInventoryPushLeft + 1; -const CoordType kFinalMessageTop = kInventoryPushTop + 24; +static const CoordType kFinalMessageLeft = kInventoryPushLeft + 1; +static const CoordType kFinalMessageTop = kInventoryPushTop + 24; ///////////////////////////////////////////// // // Notifications. -const NotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1; -const NotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1; -const NotificationID kAINotificationID = kInterfaceNotificationID + 1; -const NotificationID kNoradNotificationID = kAINotificationID + 1; -const NotificationID kNoradECRNotificationID = kNoradNotificationID + 1; -const NotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1; -const NotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1; -const NotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1; -const NotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1; -const NotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1; -const NotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1; -const NotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1; -const NotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1; -const NotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1; -const NotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1; -const NotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1; +static const NotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1; +static const NotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1; +static const NotificationID kAINotificationID = kInterfaceNotificationID + 1; +static const NotificationID kNoradNotificationID = kAINotificationID + 1; +static const NotificationID kNoradECRNotificationID = kNoradNotificationID + 1; +static const NotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1; +static const NotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1; +static const NotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1; +static const NotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1; +static const NotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1; +static const NotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1; +static const NotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1; +static const NotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1; +static const NotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1; +static const NotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1; +static const NotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1; // Sent to the shell by fShellNotification. -const NotificationFlags kGameStartingFlag = 1; -const NotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1; -const NotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1; +static const NotificationFlags kGameStartingFlag = 1; +static const NotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1; +static const NotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1; -const NotificationFlags kJMPShellNotificationFlags = kGameStartingFlag | +static const NotificationFlags kJMPShellNotificationFlags = kGameStartingFlag | kNeedNewJumpFlag | kPlayerDiedFlag; // Sent to the interface. -const NotificationFlags kInventoryLidOpenFlag = 1; -const NotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1; -const NotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1; -const NotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1; -const NotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1; -const NotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1; -const NotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1; -const NotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1; - -const NotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | +static const NotificationFlags kInventoryLidOpenFlag = 1; +static const NotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1; +static const NotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1; +static const NotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1; +static const NotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1; +static const NotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1; +static const NotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1; +static const NotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1; + +static const NotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | kInventoryLidClosedFlag | kInventoryDrawerUpFlag | kInventoryDrawerDownFlag | @@ -418,28 +418,28 @@ const NotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | // Neighborhood hot spots. -const HotSpotID kFirstNeighborhoodSpotID = 5000; +static const HotSpotID kFirstNeighborhoodSpotID = 5000; // kShellSpotFlag is a flag which marks all hot spots which belong to the shell, like // the current item and current biochip spots. -const HotSpotFlags kShellSpotFlag = 1; +static const HotSpotFlags kShellSpotFlag = 1; // kNeighborhoodSpotFlag is a flag which marks all hot spots which belong to a // neighborhood, like buttons on walls and so on. -const HotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1; +static const HotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1; // kZoomInSpotFlag is a flag which marks all hot spots which indicate a zoom. -const HotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1; +static const HotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1; // kZoomOutSpotFlag is a flag which marks all hot spots which indicate a zoom. -const HotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1; +static const HotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1; -const HotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1; -const HotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1; -const HotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1; -const HotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1; -const HotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1; +static const HotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1; +static const HotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1; +static const HotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1; +static const HotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1; +static const HotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1; -const HotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag; +static const HotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag; -const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; +static const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; ///////////////////////////////////////////// // @@ -448,64 +448,64 @@ const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; // Shell hot spots. // The shell reserves all hot spot IDs from 0 to 999 -const HotSpotID kCurrentItemSpotID = 0; -const HotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1; +static const HotSpotID kCurrentItemSpotID = 0; +static const HotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1; -const HotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1; -const HotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1; +static const HotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1; +static const HotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1; -const HotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1; +static const HotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1; -const HotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1; -const HotSpotID kAIHint2SpotID = kAIHint1SpotID + 1; -const HotSpotID kAIHint3SpotID = kAIHint2SpotID + 1; -const HotSpotID kAISolveSpotID = kAIHint3SpotID + 1; -const HotSpotID kAIBriefingSpotID = kAISolveSpotID + 1; -const HotSpotID kAIScanSpotID = kAIBriefingSpotID + 1; +static const HotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1; +static const HotSpotID kAIHint2SpotID = kAIHint1SpotID + 1; +static const HotSpotID kAIHint3SpotID = kAIHint2SpotID + 1; +static const HotSpotID kAISolveSpotID = kAIHint3SpotID + 1; +static const HotSpotID kAIBriefingSpotID = kAISolveSpotID + 1; +static const HotSpotID kAIScanSpotID = kAIBriefingSpotID + 1; -const HotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1; +static const HotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1; -const HotSpotID kAriesSpotID = kPegasusRecallSpotID + 1; -const HotSpotID kMercurySpotID = kAriesSpotID + 1; -const HotSpotID kPoseidonSpotID = kMercurySpotID + 1; +static const HotSpotID kAriesSpotID = kPegasusRecallSpotID + 1; +static const HotSpotID kMercurySpotID = kAriesSpotID + 1; +static const HotSpotID kPoseidonSpotID = kMercurySpotID + 1; -const HotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1; +static const HotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1; -const HotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1; -const HotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1; -const HotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1; -const HotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1; -const HotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1; +static const HotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1; +static const HotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1; +static const HotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1; +static const HotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1; +static const HotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1; // Most of these are obsolete: // kInventoryDropSpotFlag is a flag which marks hot spots which are valid drop spots // for inventory items. -// const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; +// static const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; // kBiochipDropSpotFlag is a flag which marks hot spots which are valid drop spots // for biochips. -// const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; +// static const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; // kInventorySpotFlag is a flag which marks hot spots which indicate inventory items // in the environment. -// const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; +// static const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; // kBiochipSpotFlag is a flag which marks hot spots which indicate biochips // in the environment. -const HotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1; -const HotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1; +static const HotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1; +static const HotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1; -const HotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1; +static const HotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1; // Biochip and inventory hot spot flags... -const HotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1; -const HotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1; -const HotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1; -const HotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1; +static const HotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1; +static const HotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1; +static const HotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1; +static const HotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1; -const HotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag | +static const HotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag | kPlayExtraSpotFlag | kOpenDoorSpotFlag | kInfoReturnSpotFlag | @@ -514,115 +514,115 @@ const HotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag | kOpticalBiochipSpotFlag | kAirMaskSpotFlag; -const int32 kMainMenuID = 1; -const int32 kPauseMenuID = 2; -const int32 kCreditsMenuID = 3; -const int32 kDeathMenuID = 4; +static const int32 kMainMenuID = 1; +static const int32 kPauseMenuID = 2; +static const int32 kCreditsMenuID = 3; +static const int32 kDeathMenuID = 4; ///////////////////////////////////////////// // // Menu commands. -const GameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1; -const GameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1; -const GameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1; -const GameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1; -const GameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1; -const GameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1; +static const GameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1; +static const GameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1; +static const GameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1; +static const GameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1; +static const GameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1; +static const GameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1; -const GameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1; +static const GameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1; -const GameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1; -const GameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1; +static const GameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1; +static const GameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1; -const GameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1; -const GameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1; +static const GameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1; +static const GameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1; -const GameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1; -const GameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1; -const GameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1; -const GameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1; +static const GameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1; +static const GameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1; +static const GameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1; +static const GameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1; -const GameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1; +static const GameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1; -const GameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1; -const GameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1; +static const GameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1; +static const GameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1; -const TimeValue kMenuButtonHiliteTime = 20; -const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond; +static const TimeValue kMenuButtonHiliteTime = 20; +static const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond; // PICT resources: // Warning light PICTs: -const ResIDType kLightOffID = 128; -const ResIDType kLightYellowID = 129; -const ResIDType kLightOrangeID = 130; -const ResIDType kLightRedID = 131; +static const ResIDType kLightOffID = 128; +static const ResIDType kLightYellowID = 129; +static const ResIDType kLightOrangeID = 130; +static const ResIDType kLightRedID = 131; // Date PICTs: -const ResIDType kDatePrehistoricID = 138; -const ResIDType kDate2112ID = 139; -const ResIDType kDate2185ID = 140; -const ResIDType kDate2310ID = 141; -const ResIDType kDate2318ID = 142; +static const ResIDType kDatePrehistoricID = 138; +static const ResIDType kDate2112ID = 139; +static const ResIDType kDate2185ID = 140; +static const ResIDType kDate2310ID = 141; +static const ResIDType kDate2318ID = 142; ///////////////////////////////////////////// // // Display Order -const DisplayOrder kCroppedMovieLayer = 11000; - -const DisplayOrder kMonitorLayer = 12000; - -const DisplayOrder kDragSpriteLayer = 15000; -const DisplayOrder kDragSpriteOrder = kDragSpriteLayer; - -const DisplayOrder kInterfaceLayer = 20000; -const DisplayOrder kBackground1Order = kInterfaceLayer; -const DisplayOrder kBackground2Order = kBackground1Order + 1; -const DisplayOrder kBackground3Order = kBackground2Order + 1; -const DisplayOrder kBackground4Order = kBackground3Order + 1; -const DisplayOrder kDateOrder = kBackground4Order + 1; -const DisplayOrder kCompassOrder = kDateOrder + 1; -const DisplayOrder kEnergyBarOrder = kCompassOrder + 1; -const DisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1; - -const DisplayOrder kAILayer = 22000; -const DisplayOrder kAILeftAreaOrder = kAILayer; -const DisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1; -const DisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1; -const DisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1; - -const DisplayOrder kHilitesLayer = 23000; -const DisplayOrder kInventoryHiliteOrder = kHilitesLayer; -const DisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1; - -const DisplayOrder kPanelsLayer = 25000; -const DisplayOrder kInventoryPushOrder = kPanelsLayer; -const DisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1; -const DisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1; -const DisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1; -const DisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1; - -const DisplayOrder kInfoLayer = 26000; -const DisplayOrder kInfoBackgroundOrder = kInfoLayer; -const DisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1; - -const DisplayOrder kScreenDimmerOrder = 30000; - -const DisplayOrder kPauseScreenLayer = 31000; -const DisplayOrder kPauseMenuOrder = kPauseScreenLayer; -const DisplayOrder kSaveGameOrder = kPauseMenuOrder + 1; -const DisplayOrder kContinueOrder = kSaveGameOrder + 1; -const DisplayOrder kRestoreOrder = kContinueOrder + 1; -const DisplayOrder kSoundFXOrder = kRestoreOrder + 1; -const DisplayOrder kAmbienceOrder = kSoundFXOrder + 1; -const DisplayOrder kWalkthruOrder = kAmbienceOrder + 1; -const DisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1; -const DisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1; -const DisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1; +static const DisplayOrder kCroppedMovieLayer = 11000; + +static const DisplayOrder kMonitorLayer = 12000; + +static const DisplayOrder kDragSpriteLayer = 15000; +static const DisplayOrder kDragSpriteOrder = kDragSpriteLayer; + +static const DisplayOrder kInterfaceLayer = 20000; +static const DisplayOrder kBackground1Order = kInterfaceLayer; +static const DisplayOrder kBackground2Order = kBackground1Order + 1; +static const DisplayOrder kBackground3Order = kBackground2Order + 1; +static const DisplayOrder kBackground4Order = kBackground3Order + 1; +static const DisplayOrder kDateOrder = kBackground4Order + 1; +static const DisplayOrder kCompassOrder = kDateOrder + 1; +static const DisplayOrder kEnergyBarOrder = kCompassOrder + 1; +static const DisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1; + +static const DisplayOrder kAILayer = 22000; +static const DisplayOrder kAILeftAreaOrder = kAILayer; +static const DisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1; +static const DisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1; +static const DisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1; + +static const DisplayOrder kHilitesLayer = 23000; +static const DisplayOrder kInventoryHiliteOrder = kHilitesLayer; +static const DisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1; + +static const DisplayOrder kPanelsLayer = 25000; +static const DisplayOrder kInventoryPushOrder = kPanelsLayer; +static const DisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1; +static const DisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1; +static const DisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1; +static const DisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1; + +static const DisplayOrder kInfoLayer = 26000; +static const DisplayOrder kInfoBackgroundOrder = kInfoLayer; +static const DisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1; + +static const DisplayOrder kScreenDimmerOrder = 30000; + +static const DisplayOrder kPauseScreenLayer = 31000; +static const DisplayOrder kPauseMenuOrder = kPauseScreenLayer; +static const DisplayOrder kSaveGameOrder = kPauseMenuOrder + 1; +static const DisplayOrder kContinueOrder = kSaveGameOrder + 1; +static const DisplayOrder kRestoreOrder = kContinueOrder + 1; +static const DisplayOrder kSoundFXOrder = kRestoreOrder + 1; +static const DisplayOrder kAmbienceOrder = kSoundFXOrder + 1; +static const DisplayOrder kWalkthruOrder = kAmbienceOrder + 1; +static const DisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1; +static const DisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1; +static const DisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1; ///////////////////////////////////////////// // @@ -718,7 +718,7 @@ enum { ///////////////////////////////////////////// // -// Mode constants. +// Mode static constants. static const GameMode kModeInventoryPick = kLastGameShellMode + 1; static const GameMode kModeBiochipPick = kModeInventoryPick + 1; diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h index 6d743c3408..b50f8503ef 100755 --- a/engines/pegasus/items/item.h +++ b/engines/pegasus/items/item.h @@ -68,9 +68,9 @@ struct ItemStateInfo { // ItemExtraEntry -const short kLeftAreaExtra = 0; -const short kMiddleAreaExtra = 1; -const short kRightAreaExtra = 2; +static const short kLeftAreaExtra = 0; +static const short kMiddleAreaExtra = 1; +static const short kRightAreaExtra = 2; struct ItemExtraEntry { uint32 extraID; @@ -90,184 +90,184 @@ struct ItemExtraInfo { // Individual inventory items are stored in these resource types. // Resource ID is item ID + kItemBaseResID. -const uint32 kItemInfoResType = MKTAG('I', 't', 'e', 'm'); // JMPItemInfoHandle -const uint32 kLeftAreaInfoResType = MKTAG('L', 'e', 'f', 't'); // ItemStateInfoHandle -const uint32 kMiddleAreaInfoResType = MKTAG('M', 'i', 'd', 'l'); // ItemStateInfoHandle -const uint32 kRightAreaInfoResType = MKTAG('R', 'g', 'h', 't'); // ItemStateInfoHandle -const uint32 kItemExtraInfoResType = MKTAG('I', 'X', 't', 'r'); // ItemExtraInfoHandle +static const uint32 kItemInfoResType = MKTAG('I', 't', 'e', 'm'); // JMPItemInfoHandle +static const uint32 kLeftAreaInfoResType = MKTAG('L', 'e', 'f', 't'); // ItemStateInfoHandle +static const uint32 kMiddleAreaInfoResType = MKTAG('M', 'i', 'd', 'l'); // ItemStateInfoHandle +static const uint32 kRightAreaInfoResType = MKTAG('R', 'g', 'h', 't'); // ItemStateInfoHandle +static const uint32 kItemExtraInfoResType = MKTAG('I', 'X', 't', 'r'); // ItemExtraInfoHandle -const uint16 kItemBaseResID = 128; +static const uint16 kItemBaseResID = 128; // Item IDs. -const ItemID kAirMask = 7; -const ItemID kAntidote = 8; -const ItemID kArgonCanister = 9; -const ItemID kCardBomb = 10; -const ItemID kCrowbar = 11; -const ItemID kGasCanister = 12; -const ItemID kHistoricalLog = 13; -const ItemID kJourneymanKey = 14; -const ItemID kKeyCard = 15; -const ItemID kMachineGun = 16; -const ItemID kMarsCard = 17; -const ItemID kNitrogenCanister = 18; -const ItemID kOrangeJuiceGlassFull = 19; -const ItemID kOrangeJuiceGlassEmpty = 20; -const ItemID kPoisonDart = 21; -const ItemID kSinclairKey = 22; -const ItemID kStunGun = 23; -const ItemID kArgonPickup = 24; +static const ItemID kAirMask = 7; +static const ItemID kAntidote = 8; +static const ItemID kArgonCanister = 9; +static const ItemID kCardBomb = 10; +static const ItemID kCrowbar = 11; +static const ItemID kGasCanister = 12; +static const ItemID kHistoricalLog = 13; +static const ItemID kJourneymanKey = 14; +static const ItemID kKeyCard = 15; +static const ItemID kMachineGun = 16; +static const ItemID kMarsCard = 17; +static const ItemID kNitrogenCanister = 18; +static const ItemID kOrangeJuiceGlassFull = 19; +static const ItemID kOrangeJuiceGlassEmpty = 20; +static const ItemID kPoisonDart = 21; +static const ItemID kSinclairKey = 22; +static const ItemID kStunGun = 23; +static const ItemID kArgonPickup = 24; // Biochips. -const ItemID kAIBiochip = 0; -const ItemID kInterfaceBiochip = 1; -const ItemID kMapBiochip = 2; -const ItemID kOpticalBiochip = 3; -const ItemID kPegasusBiochip = 4; -const ItemID kRetinalScanBiochip = 5; -const ItemID kShieldBiochip = 6; +static const ItemID kAIBiochip = 0; +static const ItemID kInterfaceBiochip = 1; +static const ItemID kMapBiochip = 2; +static const ItemID kOpticalBiochip = 3; +static const ItemID kPegasusBiochip = 4; +static const ItemID kRetinalScanBiochip = 5; +static const ItemID kShieldBiochip = 6; -const ItemID kNumItems = 25; +static const ItemID kNumItems = 25; // Item States. -const ItemState kAI000 = 0; -const ItemState kAI005 = 1; -const ItemState kAI006 = 2; -const ItemState kAI010 = 3; -const ItemState kAI015 = 4; -const ItemState kAI016 = 5; -const ItemState kAI020 = 6; -const ItemState kAI024 = 7; -const ItemState kAI100 = 8; -const ItemState kAI101 = 9; -const ItemState kAI105 = 10; -const ItemState kAI106 = 11; -const ItemState kAI110 = 12; -const ItemState kAI111 = 13; -const ItemState kAI115 = 14; -const ItemState kAI116 = 15; -const ItemState kAI120 = 16; -const ItemState kAI121 = 17; -const ItemState kAI124 = 18; -const ItemState kAI125 = 19; -const ItemState kAI126 = 20; -const ItemState kAI200 = 21; -const ItemState kAI201 = 22; -const ItemState kAI202 = 23; -const ItemState kAI205 = 24; -const ItemState kAI206 = 25; -const ItemState kAI210 = 26; -const ItemState kAI211 = 27; -const ItemState kAI212 = 28; -const ItemState kAI215 = 29; -const ItemState kAI216 = 30; -const ItemState kAI220 = 31; -const ItemState kAI221 = 32; -const ItemState kAI222 = 33; -const ItemState kAI224 = 34; -const ItemState kAI225 = 35; -const ItemState kAI226 = 36; -const ItemState kAI300 = 37; -const ItemState kAI301 = 38; -const ItemState kAI302 = 39; -const ItemState kAI303 = 40; -const ItemState kAI305 = 41; -const ItemState kAI306 = 42; -const ItemState kAI310 = 43; -const ItemState kAI311 = 44; -const ItemState kAI312 = 45; -const ItemState kAI313 = 46; -const ItemState kAI315 = 47; -const ItemState kAI316 = 48; -const ItemState kAI320 = 49; -const ItemState kAI321 = 50; -const ItemState kAI322 = 51; -const ItemState kAI323 = 52; -const ItemState kAI324 = 53; -const ItemState kAI325 = 54; -const ItemState kAI326 = 55; -const ItemState kNormalItem = 56; -const ItemState kMapUnavailable = 57; -const ItemState kMapEngaged = 58; -const ItemState kOptical000 = 59; -const ItemState kOptical001 = 60; -const ItemState kOptical002 = 61; -const ItemState kOptical010 = 62; -const ItemState kOptical011 = 63; -const ItemState kOptical012 = 64; -const ItemState kOptical020 = 65; -const ItemState kOptical021 = 66; -const ItemState kOptical100 = 67; -const ItemState kOptical101 = 68; -const ItemState kOptical102 = 69; -const ItemState kOptical110 = 70; -const ItemState kOptical111 = 71; -const ItemState kOptical112 = 72; -const ItemState kOptical120 = 73; -const ItemState kOptical121 = 74; -const ItemState kOptical200 = 75; -const ItemState kOptical201 = 76; -const ItemState kOptical210 = 77; -const ItemState kOptical211 = 78; -const ItemState kPegasusTSA00 = 79; -const ItemState kPegasusTSA10 = 80; -const ItemState kPegasusPrehistoric00 = 81; -const ItemState kPegasusPrehistoric01 = 82; -const ItemState kPegasusPrehistoric10 = 83; -const ItemState kPegasusPrehistoric11 = 84; -const ItemState kPegasusMars00 = 85; -const ItemState kPegasusMars01 = 86; -const ItemState kPegasusMars10 = 87; -const ItemState kPegasusMars11 = 88; -const ItemState kPegasusNorad00 = 89; -const ItemState kPegasusNorad01 = 90; -const ItemState kPegasusNorad10 = 91; -const ItemState kPegasusNorad11 = 92; -const ItemState kPegasusWSC00 = 93; -const ItemState kPegasusWSC01 = 94; -const ItemState kPegasusWSC10 = 95; -const ItemState kPegasusWSC11 = 96; -const ItemState kPegasusCaldoria = 97; -const ItemState kRetinalSimulating = 98; -const ItemState kShieldNormal = 99; -const ItemState kShieldRadiation = 100; -const ItemState kShieldPlasma = 101; -const ItemState kShieldCardBomb = 102; -const ItemState kShieldDraining = 103; -const ItemState kAirMaskEmptyOff = 104; -const ItemState kAirMaskEmptyFilter = 105; -const ItemState kAirMaskLowOff = 106; -const ItemState kAirMaskLowFilter = 107; -const ItemState kAirMaskLowOn = 108; -const ItemState kAirMaskFullOff = 109; -const ItemState kAirMaskFullFilter = 110; -const ItemState kAirMaskFullOn = 111; -const ItemState kArgonEmpty = 112; -const ItemState kArgonFull = 113; -const ItemState kFlashlightOff = 114; -const ItemState kFlashlightOn = 115; -const ItemState kNitrogenEmpty = 116; -const ItemState kNitrogenFull = 117; -const ItemState kFullGlass = 118; +static const ItemState kAI000 = 0; +static const ItemState kAI005 = 1; +static const ItemState kAI006 = 2; +static const ItemState kAI010 = 3; +static const ItemState kAI015 = 4; +static const ItemState kAI016 = 5; +static const ItemState kAI020 = 6; +static const ItemState kAI024 = 7; +static const ItemState kAI100 = 8; +static const ItemState kAI101 = 9; +static const ItemState kAI105 = 10; +static const ItemState kAI106 = 11; +static const ItemState kAI110 = 12; +static const ItemState kAI111 = 13; +static const ItemState kAI115 = 14; +static const ItemState kAI116 = 15; +static const ItemState kAI120 = 16; +static const ItemState kAI121 = 17; +static const ItemState kAI124 = 18; +static const ItemState kAI125 = 19; +static const ItemState kAI126 = 20; +static const ItemState kAI200 = 21; +static const ItemState kAI201 = 22; +static const ItemState kAI202 = 23; +static const ItemState kAI205 = 24; +static const ItemState kAI206 = 25; +static const ItemState kAI210 = 26; +static const ItemState kAI211 = 27; +static const ItemState kAI212 = 28; +static const ItemState kAI215 = 29; +static const ItemState kAI216 = 30; +static const ItemState kAI220 = 31; +static const ItemState kAI221 = 32; +static const ItemState kAI222 = 33; +static const ItemState kAI224 = 34; +static const ItemState kAI225 = 35; +static const ItemState kAI226 = 36; +static const ItemState kAI300 = 37; +static const ItemState kAI301 = 38; +static const ItemState kAI302 = 39; +static const ItemState kAI303 = 40; +static const ItemState kAI305 = 41; +static const ItemState kAI306 = 42; +static const ItemState kAI310 = 43; +static const ItemState kAI311 = 44; +static const ItemState kAI312 = 45; +static const ItemState kAI313 = 46; +static const ItemState kAI315 = 47; +static const ItemState kAI316 = 48; +static const ItemState kAI320 = 49; +static const ItemState kAI321 = 50; +static const ItemState kAI322 = 51; +static const ItemState kAI323 = 52; +static const ItemState kAI324 = 53; +static const ItemState kAI325 = 54; +static const ItemState kAI326 = 55; +static const ItemState kNormalItem = 56; +static const ItemState kMapUnavailable = 57; +static const ItemState kMapEngaged = 58; +static const ItemState kOptical000 = 59; +static const ItemState kOptical001 = 60; +static const ItemState kOptical002 = 61; +static const ItemState kOptical010 = 62; +static const ItemState kOptical011 = 63; +static const ItemState kOptical012 = 64; +static const ItemState kOptical020 = 65; +static const ItemState kOptical021 = 66; +static const ItemState kOptical100 = 67; +static const ItemState kOptical101 = 68; +static const ItemState kOptical102 = 69; +static const ItemState kOptical110 = 70; +static const ItemState kOptical111 = 71; +static const ItemState kOptical112 = 72; +static const ItemState kOptical120 = 73; +static const ItemState kOptical121 = 74; +static const ItemState kOptical200 = 75; +static const ItemState kOptical201 = 76; +static const ItemState kOptical210 = 77; +static const ItemState kOptical211 = 78; +static const ItemState kPegasusTSA00 = 79; +static const ItemState kPegasusTSA10 = 80; +static const ItemState kPegasusPrehistoric00 = 81; +static const ItemState kPegasusPrehistoric01 = 82; +static const ItemState kPegasusPrehistoric10 = 83; +static const ItemState kPegasusPrehistoric11 = 84; +static const ItemState kPegasusMars00 = 85; +static const ItemState kPegasusMars01 = 86; +static const ItemState kPegasusMars10 = 87; +static const ItemState kPegasusMars11 = 88; +static const ItemState kPegasusNorad00 = 89; +static const ItemState kPegasusNorad01 = 90; +static const ItemState kPegasusNorad10 = 91; +static const ItemState kPegasusNorad11 = 92; +static const ItemState kPegasusWSC00 = 93; +static const ItemState kPegasusWSC01 = 94; +static const ItemState kPegasusWSC10 = 95; +static const ItemState kPegasusWSC11 = 96; +static const ItemState kPegasusCaldoria = 97; +static const ItemState kRetinalSimulating = 98; +static const ItemState kShieldNormal = 99; +static const ItemState kShieldRadiation = 100; +static const ItemState kShieldPlasma = 101; +static const ItemState kShieldCardBomb = 102; +static const ItemState kShieldDraining = 103; +static const ItemState kAirMaskEmptyOff = 104; +static const ItemState kAirMaskEmptyFilter = 105; +static const ItemState kAirMaskLowOff = 106; +static const ItemState kAirMaskLowFilter = 107; +static const ItemState kAirMaskLowOn = 108; +static const ItemState kAirMaskFullOff = 109; +static const ItemState kAirMaskFullFilter = 110; +static const ItemState kAirMaskFullOn = 111; +static const ItemState kArgonEmpty = 112; +static const ItemState kArgonFull = 113; +static const ItemState kFlashlightOff = 114; +static const ItemState kFlashlightOn = 115; +static const ItemState kNitrogenEmpty = 116; +static const ItemState kNitrogenFull = 117; +static const ItemState kFullGlass = 118; // Extra IDs. -const uint32 kRetinalScanSearching = 0; -const uint32 kRetinalScanActivated = 1; -const uint32 kShieldIntro = 2; -const uint32 kRemoveAirMask = 3; -const uint32 kRemoveArgon = 4; -const uint32 kRemoveCrowbar = 5; -const uint32 kGasCanLoop = 6; -const uint32 kRemoveJourneymanKey = 7; -const uint32 kRemoveMarsCard = 8; -const uint32 kRemoveNitrogen = 9; -const uint32 kRemoveGlass = 10; -const uint32 kRemoveDart = 11; -const uint32 kRemoveSinclairKey = 12; +static const uint32 kRetinalScanSearching = 0; +static const uint32 kRetinalScanActivated = 1; +static const uint32 kShieldIntro = 2; +static const uint32 kRemoveAirMask = 3; +static const uint32 kRemoveArgon = 4; +static const uint32 kRemoveCrowbar = 5; +static const uint32 kGasCanLoop = 6; +static const uint32 kRemoveJourneymanKey = 7; +static const uint32 kRemoveMarsCard = 8; +static const uint32 kRemoveNitrogen = 9; +static const uint32 kRemoveGlass = 10; +static const uint32 kRemoveDart = 11; +static const uint32 kRemoveSinclairKey = 12; enum ItemType { kInventoryItemType, diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp index 82bafbc033..b1763a5b38 100755 --- a/engines/pegasus/menu.cpp +++ b/engines/pegasus/menu.cpp @@ -930,60 +930,60 @@ enum { kLastPauseSelection = kPauseMenuQuitToMainMenu }; -const CoordType kPauseLeft = 194; -const CoordType kPauseTop = 68; +static const CoordType kPauseLeft = 194; +static const CoordType kPauseTop = 68; -const CoordType kSaveGameLeft = kPauseLeft + 6; -const CoordType kSaveGameTop = kPauseTop + 56; +static const CoordType kSaveGameLeft = kPauseLeft + 6; +static const CoordType kSaveGameTop = kPauseTop + 56; -const CoordType kSaveGameSelectLeft = kPauseLeft - 44; -const CoordType kSaveGameSelectTop = kPauseTop + 52; +static const CoordType kSaveGameSelectLeft = kPauseLeft - 44; +static const CoordType kSaveGameSelectTop = kPauseTop + 52; -const CoordType kPauseContinueLeft = kPauseLeft + 18; -const CoordType kPauseContinueTop = kPauseTop + 100; +static const CoordType kPauseContinueLeft = kPauseLeft + 18; +static const CoordType kPauseContinueTop = kPauseTop + 100; -const CoordType kPauseContinueSelectLeft = kPauseLeft - 44; -const CoordType kPauseContinueSelectTop = kPauseTop + 95; +static const CoordType kPauseContinueSelectLeft = kPauseLeft - 44; +static const CoordType kPauseContinueSelectTop = kPauseTop + 95; -const CoordType kPauseRestoreLeft = kPauseLeft + 18; -const CoordType kPauseRestoreTop = kPauseTop + 136; +static const CoordType kPauseRestoreLeft = kPauseLeft + 18; +static const CoordType kPauseRestoreTop = kPauseTop + 136; -const CoordType kPauseRestoreSelectLeft = kPauseLeft - 44; -const CoordType kPauseRestoreSelectTop = kPauseTop + 131; +static const CoordType kPauseRestoreSelectLeft = kPauseLeft - 44; +static const CoordType kPauseRestoreSelectTop = kPauseTop + 131; -const CoordType kSoundFXLeft = kPauseLeft + 128; -const CoordType kSoundFXTop = kPauseTop + 187; -const CoordType kSoundFXRight = kSoundFXLeft + 96; -const CoordType kSoundFXBottom = kSoundFXTop + 14; +static const CoordType kSoundFXLeft = kPauseLeft + 128; +static const CoordType kSoundFXTop = kPauseTop + 187; +static const CoordType kSoundFXRight = kSoundFXLeft + 96; +static const CoordType kSoundFXBottom = kSoundFXTop + 14; -const CoordType kSoundFXSelectLeft = kPauseLeft - 44; -const CoordType kSoundFXSelectTop = kPauseTop + 172; +static const CoordType kSoundFXSelectLeft = kPauseLeft - 44; +static const CoordType kSoundFXSelectTop = kPauseTop + 172; -const CoordType kAmbienceLeft = kPauseLeft + 128; -const CoordType kAmbienceTop = kPauseTop + 227; -const CoordType kAmbienceRight = kAmbienceLeft + 96; -const CoordType kAmbienceBottom = kAmbienceTop + 14; +static const CoordType kAmbienceLeft = kPauseLeft + 128; +static const CoordType kAmbienceTop = kPauseTop + 227; +static const CoordType kAmbienceRight = kAmbienceLeft + 96; +static const CoordType kAmbienceBottom = kAmbienceTop + 14; -const CoordType kAmbienceSelectLeft = kPauseLeft - 44; -const CoordType kAmbienceSelectTop = kPauseTop + 212; +static const CoordType kAmbienceSelectLeft = kPauseLeft - 44; +static const CoordType kAmbienceSelectTop = kPauseTop + 212; -const CoordType kWalkthruLeft = kPauseLeft + 128; -const CoordType kWalkthruTop = kPauseTop + 264; +static const CoordType kWalkthruLeft = kPauseLeft + 128; +static const CoordType kWalkthruTop = kPauseTop + 264; -const CoordType kWalkthruSelectLeft = kPauseLeft - 44; -const CoordType kWalkthruSelectTop = kPauseTop + 255; +static const CoordType kWalkthruSelectLeft = kPauseLeft - 44; +static const CoordType kWalkthruSelectTop = kPauseTop + 255; -const CoordType kQuitLeft = kPauseLeft + 18; -const CoordType kQuitTop = kPauseTop + 302; +static const CoordType kQuitLeft = kPauseLeft + 18; +static const CoordType kQuitTop = kPauseTop + 302; -const CoordType kQuitSelectLeft = kPauseLeft - 44; -const CoordType kQuitSelectTop = kPauseTop + 297; +static const CoordType kQuitSelectLeft = kPauseLeft - 44; +static const CoordType kQuitSelectTop = kPauseTop + 297; // These are relative to the pause background. -const CoordType kPauseScoreLeft = 130; -const CoordType kPauseScoreTop = 34; -const CoordType kPauseScoreRight = kPauseScoreLeft + 108; -const CoordType kPauseScoreBottom = kPauseScoreTop + 12; +static const CoordType kPauseScoreLeft = 130; +static const CoordType kPauseScoreTop = 34; +static const CoordType kPauseScoreRight = kPauseScoreLeft + 108; +static const CoordType kPauseScoreBottom = kPauseScoreTop + 12; // Never set the current input handler to the CPauseMenu. PauseMenu::PauseMenu() : GameMenu(kPauseMenuID), _pauseBackground(0), _saveButton(0), _restoreButton(0), diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp index 6f512fa8aa..1ea6e12f85 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp @@ -42,109 +42,109 @@ namespace Pegasus { -const short kVidPhoneAngle = 30; -const short kReplicatorAngle = 50; -const short kDrawersAngle = -30; -const short kCaldoria53Angle = 45; -const short kCaldoria55Angle = -45; +static const int16 kVidPhoneAngle = 30; +static const int16 kReplicatorAngle = 50; +static const int16 kDrawersAngle = -30; +static const int16 kCaldoria53Angle = 45; +static const int16 kCaldoria55Angle = -45; -const TimeValue kSinclairInterruptionTime1 = 2955; -const TimeValue kSinclairInterruptionTime2 = 6835; -const TimeValue kSinclairInterruptionTime3 = 9835; -const TimeValue kSinclairInterruptionTime4 = 12555; +static const TimeValue kSinclairInterruptionTime1 = 2955; +static const TimeValue kSinclairInterruptionTime2 = 6835; +static const TimeValue kSinclairInterruptionTime3 = 9835; +static const TimeValue kSinclairInterruptionTime4 = 12555; -const InputBits kPullbackInterruptFilter = kFilterAllInput; -const InputBits kRecalibrationInterruptFilter = kFilterAllInput; +static const InputBits kPullbackInterruptFilter = kFilterAllInput; +static const InputBits kRecalibrationInterruptFilter = kFilterAllInput; -const TimeValue kCaldoriaReplicatorIntroIn = 4933; -const TimeValue kCaldoriaReplicatorIntroOut = 6557; +static const TimeValue kCaldoriaReplicatorIntroIn = 4933; +static const TimeValue kCaldoriaReplicatorIntroOut = 6557; -const TimeValue kCaldoriaReplicatorWrongChoiceIn = 6557; -const TimeValue kCaldoriaReplicatorWrongChoiceOut = 8586; +static const TimeValue kCaldoriaReplicatorWrongChoiceIn = 6557; +static const TimeValue kCaldoriaReplicatorWrongChoiceOut = 8586; -const TimeValue kCaldoriaReplicatorOJChoiceIn = 8586; -const TimeValue kCaldoriaReplicatorOJChoiceOut = 11687; +static const TimeValue kCaldoriaReplicatorOJChoiceIn = 8586; +static const TimeValue kCaldoriaReplicatorOJChoiceOut = 11687; -const TimeValue kCaldoriaMessagesIntroIn = 11687; -const TimeValue kCaldoriaMessagesIntroOut = 13641; +static const TimeValue kCaldoriaMessagesIntroIn = 11687; +static const TimeValue kCaldoriaMessagesIntroOut = 13641; -const TimeValue kCaldoriaFirstMessageIn = 13641; -const TimeValue kCaldoriaFirstMessageOut = 14203; +static const TimeValue kCaldoriaFirstMessageIn = 13641; +static const TimeValue kCaldoriaFirstMessageOut = 14203; -const TimeValue kCaldoriaSecondMessageIn = 14203; -const TimeValue kCaldoriaSecondMessageOut = 14750; +static const TimeValue kCaldoriaSecondMessageIn = 14203; +static const TimeValue kCaldoriaSecondMessageOut = 14750; -const TimeValue kCaldoriaDoorCloseIn = 14750; -const TimeValue kCaldoriaDoorCloseOut = 15472; +static const TimeValue kCaldoriaDoorCloseIn = 14750; +static const TimeValue kCaldoriaDoorCloseOut = 15472; -const TimeValue kCaldoriaElevatorCloseIn = 15472; -const TimeValue kCaldoriaElevatorCloseOut = 16336; +static const TimeValue kCaldoriaElevatorCloseIn = 15472; +static const TimeValue kCaldoriaElevatorCloseOut = 16336; -const TimeValue kCaldoriaShowerCloseIn = 16336; -const TimeValue kCaldoriaShowerCloseOut = 17101; +static const TimeValue kCaldoriaShowerCloseIn = 16336; +static const TimeValue kCaldoriaShowerCloseOut = 17101; -const TimeValue kCaldoriaGTDoorCloseIn = 17101; -const TimeValue kCaldoriaGTDoorCloseOut = 18523; +static const TimeValue kCaldoriaGTDoorCloseIn = 17101; +static const TimeValue kCaldoriaGTDoorCloseOut = 18523; -const TimeValue kCaldoriaNobodyHomeIn = 18523; -const TimeValue kCaldoriaNobodyHomeOut = 21469; +static const TimeValue kCaldoriaNobodyHomeIn = 18523; +static const TimeValue kCaldoriaNobodyHomeOut = 21469; -const TimeValue kCaldoriaNoOtherFloorIn = 21469; -const TimeValue kCaldoriaNoOtherFloorOut = 28013; +static const TimeValue kCaldoriaNoOtherFloorIn = 21469; +static const TimeValue kCaldoriaNoOtherFloorOut = 28013; -const TimeValue kCaldoria4DInstructionsIn = 28013; -const TimeValue kCaldoria4DInstructionsOut = 29730; +static const TimeValue kCaldoria4DInstructionsIn = 28013; +static const TimeValue kCaldoria4DInstructionsOut = 29730; -const TimeValue kCaldoriaDrinkOJIn = 33910; -const TimeValue kCaldoriaDrinkOJOut = 35846; +static const TimeValue kCaldoriaDrinkOJIn = 33910; +static const TimeValue kCaldoriaDrinkOJOut = 35846; -const TimeValue kCaldoriaNoOtherDestinationIn = 35846; -const TimeValue kCaldoriaNoOtherDestinationOut = 37877; +static const TimeValue kCaldoriaNoOtherDestinationIn = 35846; +static const TimeValue kCaldoriaNoOtherDestinationOut = 37877; -const TimeValue kCaldoriaUhghIn = 37877; -const TimeValue kCaldoriaUhghOut = 38025; +static const TimeValue kCaldoriaUhghIn = 37877; +static const TimeValue kCaldoriaUhghOut = 38025; -const TimeValue kCaldoriaSinclairShootsOSIn = 38025; -const TimeValue kCaldoriaSinclairShootsOSOut = 40649; +static const TimeValue kCaldoriaSinclairShootsOSIn = 38025; +static const TimeValue kCaldoriaSinclairShootsOSOut = 40649; -const TimeValue kCaldoriaScreamingAfterIn = 40649; -const TimeValue kCaldoriaScreamingAfterOut = 47661; +static const TimeValue kCaldoriaScreamingAfterIn = 40649; +static const TimeValue kCaldoriaScreamingAfterOut = 47661; -const TimeValue k4FloorTime = 0; +static const TimeValue k4FloorTime = 0; -const TimeValue k4To1Start = 40; -const TimeValue k4To1Stop = 7720; +static const TimeValue k4To1Start = 40; +static const TimeValue k4To1Stop = 7720; -const TimeValue k4To5Start = 7720; -const TimeValue k4To5Stop = 10280; +static const TimeValue k4To5Start = 7720; +static const TimeValue k4To5Stop = 10280; -const TimeValue k4To2Time = 10280; +static const TimeValue k4To2Time = 10280; -const TimeValue k4To3Time = 10320; +static const TimeValue k4To3Time = 10320; -const TimeValue k1FloorTime = 10360; +static const TimeValue k1FloorTime = 10360; -const TimeValue k1To4Start = 10400; -const TimeValue k1To4Stop = 18080; +static const TimeValue k1To4Start = 10400; +static const TimeValue k1To4Stop = 18080; -const TimeValue k1To5Start = 18080; -const TimeValue k1To5Stop = 28320; +static const TimeValue k1To5Start = 18080; +static const TimeValue k1To5Stop = 28320; -const TimeValue k1To2Time = 28320; +static const TimeValue k1To2Time = 28320; -const TimeValue k1To3Time = 28360; +static const TimeValue k1To3Time = 28360; -const TimeValue k5FloorTime = 28400; +static const TimeValue k5FloorTime = 28400; -const TimeValue k5To1Start = 28440; -const TimeValue k5To1Stop = 38680; +static const TimeValue k5To1Start = 28440; +static const TimeValue k5To1Stop = 38680; -const TimeValue k5To4Start = 38680; -const TimeValue k5To4Stop = 41240; +static const TimeValue k5To4Start = 38680; +static const TimeValue k5To4Stop = 41240; -const TimeValue k5To2Time = 41240; +static const TimeValue k5To2Time = 41240; -const TimeValue k5To3Time = 41280; +static const TimeValue k5To3Time = 41280; // FuseFunction functions... diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index c1e2a2c29d..64e566e95a 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -30,361 +30,361 @@ namespace Pegasus { -const TimeScale kCaldoriaMovieScale = 600; -const TimeScale kCaldoriaFramesPerSecond = 15; -const TimeScale kCaldoriaFrameDuration = 40; +static const TimeScale kCaldoriaMovieScale = 600; +static const TimeScale kCaldoriaFramesPerSecond = 15; +static const TimeScale kCaldoriaFrameDuration = 40; // Alternate IDs. -const AlternateID kAltCaldoriaNormal = 0; -const AlternateID kAltCaldoriaRoofDoorBlown = 2; -const AlternateID kAltCaldoriaSinclairDown = 3; +static const AlternateID kAltCaldoriaNormal = 0; +static const AlternateID kAltCaldoriaRoofDoorBlown = 2; +static const AlternateID kAltCaldoriaSinclairDown = 3; // Room IDs. -const RoomID kCaldoria00 = 1; -const RoomID kCaldoria01 = 2; -const RoomID kCaldoria02 = 3; -const RoomID kCaldoria03 = 4; -const RoomID kCaldoria04 = 5; -const RoomID kCaldoria05 = 6; -const RoomID kCaldoria06 = 7; -const RoomID kCaldoria07 = 8; -const RoomID kCaldoria08 = 9; -const RoomID kCaldoria09 = 10; -const RoomID kCaldoria10 = 11; -const RoomID kCaldoriaToilet = 12; -const RoomID kCaldoria11 = 13; -const RoomID kCaldoria12 = 14; -const RoomID kCaldoriaVidPhone = 15; -const RoomID kCaldoriaReplicator = 16; -const RoomID kCaldoriaDrawers = 17; -const RoomID kCaldoria13 = 18; -const RoomID kCaldoria14 = 19; -const RoomID kCaldoria15 = 20; -const RoomID kCaldoria16 = 21; -const RoomID kCaldoria17 = 22; -const RoomID kCaldoria18 = 23; -const RoomID kCaldoria19 = 24; -const RoomID kCaldoria20 = 25; -const RoomID kCaldoria21 = 26; -const RoomID kCaldoria22 = 27; -const RoomID kCaldoria23 = 28; -const RoomID kCaldoria24 = 29; -const RoomID kCaldoria25 = 30; -const RoomID kCaldoria26 = 31; -const RoomID kCaldoria27 = 32; -const RoomID kCaldoria28 = 33; -const RoomID kCaldoria29 = 34; -const RoomID kCaldoria30 = 35; -const RoomID kCaldoria31 = 36; -const RoomID kCaldoria32 = 37; -const RoomID kCaldoria33 = 38; -const RoomID kCaldoria34 = 39; -const RoomID kCaldoria35 = 40; -const RoomID kCaldoria36 = 41; -const RoomID kCaldoria37 = 42; -const RoomID kCaldoria38 = 43; -const RoomID kCaldoria39 = 44; -const RoomID kCaldoria40 = 45; -const RoomID kCaldoria41 = 46; -const RoomID kCaldoriaBinoculars = 47; -const RoomID kCaldoria42 = 48; -const RoomID kCaldoriaKiosk = 49; -const RoomID kCaldoria44 = 50; -const RoomID kCaldoria45 = 51; -const RoomID kCaldoria46 = 52; -const RoomID kCaldoria47 = 53; -const RoomID kCaldoria48 = 54; -const RoomID kCaldoria49 = 55; -const RoomID kCaldoria50 = 56; -const RoomID kCaldoria51 = 57; -const RoomID kCaldoria52 = 58; -const RoomID kCaldoria53 = 59; -const RoomID kCaldoria54 = 60; -const RoomID kCaldoria55 = 61; -const RoomID kCaldoria56 = 62; -const RoomID kCaldoriaDeathRoom = 0; +static const RoomID kCaldoria00 = 1; +static const RoomID kCaldoria01 = 2; +static const RoomID kCaldoria02 = 3; +static const RoomID kCaldoria03 = 4; +static const RoomID kCaldoria04 = 5; +static const RoomID kCaldoria05 = 6; +static const RoomID kCaldoria06 = 7; +static const RoomID kCaldoria07 = 8; +static const RoomID kCaldoria08 = 9; +static const RoomID kCaldoria09 = 10; +static const RoomID kCaldoria10 = 11; +static const RoomID kCaldoriaToilet = 12; +static const RoomID kCaldoria11 = 13; +static const RoomID kCaldoria12 = 14; +static const RoomID kCaldoriaVidPhone = 15; +static const RoomID kCaldoriaReplicator = 16; +static const RoomID kCaldoriaDrawers = 17; +static const RoomID kCaldoria13 = 18; +static const RoomID kCaldoria14 = 19; +static const RoomID kCaldoria15 = 20; +static const RoomID kCaldoria16 = 21; +static const RoomID kCaldoria17 = 22; +static const RoomID kCaldoria18 = 23; +static const RoomID kCaldoria19 = 24; +static const RoomID kCaldoria20 = 25; +static const RoomID kCaldoria21 = 26; +static const RoomID kCaldoria22 = 27; +static const RoomID kCaldoria23 = 28; +static const RoomID kCaldoria24 = 29; +static const RoomID kCaldoria25 = 30; +static const RoomID kCaldoria26 = 31; +static const RoomID kCaldoria27 = 32; +static const RoomID kCaldoria28 = 33; +static const RoomID kCaldoria29 = 34; +static const RoomID kCaldoria30 = 35; +static const RoomID kCaldoria31 = 36; +static const RoomID kCaldoria32 = 37; +static const RoomID kCaldoria33 = 38; +static const RoomID kCaldoria34 = 39; +static const RoomID kCaldoria35 = 40; +static const RoomID kCaldoria36 = 41; +static const RoomID kCaldoria37 = 42; +static const RoomID kCaldoria38 = 43; +static const RoomID kCaldoria39 = 44; +static const RoomID kCaldoria40 = 45; +static const RoomID kCaldoria41 = 46; +static const RoomID kCaldoriaBinoculars = 47; +static const RoomID kCaldoria42 = 48; +static const RoomID kCaldoriaKiosk = 49; +static const RoomID kCaldoria44 = 50; +static const RoomID kCaldoria45 = 51; +static const RoomID kCaldoria46 = 52; +static const RoomID kCaldoria47 = 53; +static const RoomID kCaldoria48 = 54; +static const RoomID kCaldoria49 = 55; +static const RoomID kCaldoria50 = 56; +static const RoomID kCaldoria51 = 57; +static const RoomID kCaldoria52 = 58; +static const RoomID kCaldoria53 = 59; +static const RoomID kCaldoria54 = 60; +static const RoomID kCaldoria55 = 61; +static const RoomID kCaldoria56 = 62; +static const RoomID kCaldoriaDeathRoom = 0; // Hot Spot Activation IDs. -const HotSpotActivationID kActivate4DClosed = 1; -const HotSpotActivationID kActivate4DOpen = 2; -const HotSpotActivationID kActivateMirrorReady = 3; -const HotSpotActivationID kActivateStylistReady = 4; -const HotSpotActivationID kActivateReplicatorReady = 5; -const HotSpotActivationID kActivateOJOnThePad = 6; -const HotSpotActivationID kActivateDrawersClosed = 7; -const HotSpotActivationID kActivateRightOpen = 8; -const HotSpotActivationID kActivateLeftOpen = 9; -const HotSpotActivationID kActivateFocusedOnShip = 10; -const HotSpotActivationID kActivateNotFocusedOnShip = 11; -const HotSpotActivationID kActivateReadyForCard = 12; -const HotSpotActivationID kActivateReadyToTransport = 13; -const HotSpotActivationID kActivateRoofSlotEmpty = 14; -const HotSpotActivationID kActivateZoomedOnSinclair = 15; +static const HotSpotActivationID kActivate4DClosed = 1; +static const HotSpotActivationID kActivate4DOpen = 2; +static const HotSpotActivationID kActivateMirrorReady = 3; +static const HotSpotActivationID kActivateStylistReady = 4; +static const HotSpotActivationID kActivateReplicatorReady = 5; +static const HotSpotActivationID kActivateOJOnThePad = 6; +static const HotSpotActivationID kActivateDrawersClosed = 7; +static const HotSpotActivationID kActivateRightOpen = 8; +static const HotSpotActivationID kActivateLeftOpen = 9; +static const HotSpotActivationID kActivateFocusedOnShip = 10; +static const HotSpotActivationID kActivateNotFocusedOnShip = 11; +static const HotSpotActivationID kActivateReadyForCard = 12; +static const HotSpotActivationID kActivateReadyToTransport = 13; +static const HotSpotActivationID kActivateRoofSlotEmpty = 14; +static const HotSpotActivationID kActivateZoomedOnSinclair = 15; // Hot Spot IDs. -const HotSpotID kCa4DEnvironOpenSpotID = 5000; -const HotSpotID kCa4DEnvironCloseSpotID = 5001; -const HotSpotID kCa4DVisualSpotID = 5002; -const HotSpotID kCa4DAudioSpotID = 5003; -const HotSpotID kCa4DChoice1SpotID = 5004; -const HotSpotID kCa4DChoice2SpotID = 5005; -const HotSpotID kCa4DChoice3SpotID = 5006; -const HotSpotID kCa4DChoice4SpotID = 5007; -const HotSpotID kCaBathroomMirrorSpotID = 5008; -const HotSpotID kCaHairStyle1SpotID = 5009; -const HotSpotID kCaHairStyle2SpotID = 5010; -const HotSpotID kCaHairStyle3SpotID = 5011; -const HotSpotID kCaShowerSpotID = 5012; -const HotSpotID kCaBathroomToiletSpotID = 5013; -const HotSpotID kCaldoriaVidPhoneSpotID = 5014; -const HotSpotID kCaldoriaReplicatorSpotID = 5015; -const HotSpotID kCaldoriaDrawersSpotID = 5016; -const HotSpotID kCaldoriaVidPhoneOutSpotID = 5017; -const HotSpotID kCaBedroomVidPhoneActivationSpotID = 5018; -const HotSpotID kCaldoriaReplicatorOutSpotID = 5019; -const HotSpotID kCaldoriaMakeOJSpotID = 5020; -const HotSpotID kCaldoriaMakeStickyBunsSpotID = 5021; -const HotSpotID kCaldoriaOrangeJuiceSpotID = 5022; -const HotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023; -const HotSpotID kCaldoriaDrawersOutSpotID = 5024; -const HotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025; -const HotSpotID kCaldoriaRightDrawerOpenSpotID = 5026; -const HotSpotID kCaldoriaKeyCardSpotID = 5027; -const HotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028; -const HotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029; -const HotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030; -const HotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031; -const HotSpotID kCaldoria20DoorbellSpotID = 5032; -const HotSpotID kCaldoria21DoorbellSpotID = 5033; -const HotSpotID kCaldoria26DoorbellSpotID = 5034; -const HotSpotID kCaldoriaFourthFloorElevator1 = 5035; -const HotSpotID kCaldoriaFourthFloorElevator2 = 5036; -const HotSpotID kCaldoriaFourthFloorElevator3 = 5037; -const HotSpotID kCaldoriaFourthFloorElevator4 = 5038; -const HotSpotID kCaldoriaFourthFloorElevator5 = 5039; -const HotSpotID kCaldoriaGroundElevator1 = 5040; -const HotSpotID kCaldoriaGroundElevator2 = 5041; -const HotSpotID kCaldoriaGroundElevator3 = 5042; -const HotSpotID kCaldoriaGroundElevator4 = 5043; -const HotSpotID kCaldoriaGroundElevator5 = 5044; -const HotSpotID kCaldoria29DoorbellSpotID = 5045; -const HotSpotID kCaldoria34DoorbellSpotID = 5046; -const HotSpotID kCaldoria35DoorbellSpotID = 5047; -const HotSpotID kCaldoriaGroundElevatorSpotID = 5048; -const HotSpotID kCaldoriaBinocularZoomInSpotID = 5049; -const HotSpotID kCaldoriaBinocularsOutSpotID = 5050; -const HotSpotID kCaldoriaZoomInOnShipSpotID = 5051; -const HotSpotID kCaldoriaKioskSpotID = 5052; -const HotSpotID kCaldoriaKioskOutSpotID = 5053; -const HotSpotID kCaldoriaKioskInfoSpotID = 5054; -const HotSpotID kCaldoriaGTCardDropSpotID = 5055; -const HotSpotID kCaldoriaGTTokyoSpotID = 5056; -const HotSpotID kCaldoriaGTTSASpotID = 5057; -const HotSpotID kCaldoriaGTBeachSpotID = 5058; -const HotSpotID kCaldoriaGTOtherSpotID = 5059; -const HotSpotID kCaldoriaRoofElevator1 = 5060; -const HotSpotID kCaldoriaRoofElevator2 = 5061; -const HotSpotID kCaldoriaRoofElevator3 = 5062; -const HotSpotID kCaldoriaRoofElevator4 = 5063; -const HotSpotID kCaldoriaRoofElevator5 = 5064; -const HotSpotID kCaldoriaRoofElevatorSpotID = 5065; -const HotSpotID kCaldoriaRoofDoorSpotID = 5066; -const HotSpotID kCaldoriaRoofCardDropSpotID = 5067; -const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; +static const HotSpotID kCa4DEnvironOpenSpotID = 5000; +static const HotSpotID kCa4DEnvironCloseSpotID = 5001; +static const HotSpotID kCa4DVisualSpotID = 5002; +static const HotSpotID kCa4DAudioSpotID = 5003; +static const HotSpotID kCa4DChoice1SpotID = 5004; +static const HotSpotID kCa4DChoice2SpotID = 5005; +static const HotSpotID kCa4DChoice3SpotID = 5006; +static const HotSpotID kCa4DChoice4SpotID = 5007; +static const HotSpotID kCaBathroomMirrorSpotID = 5008; +static const HotSpotID kCaHairStyle1SpotID = 5009; +static const HotSpotID kCaHairStyle2SpotID = 5010; +static const HotSpotID kCaHairStyle3SpotID = 5011; +static const HotSpotID kCaShowerSpotID = 5012; +static const HotSpotID kCaBathroomToiletSpotID = 5013; +static const HotSpotID kCaldoriaVidPhoneSpotID = 5014; +static const HotSpotID kCaldoriaReplicatorSpotID = 5015; +static const HotSpotID kCaldoriaDrawersSpotID = 5016; +static const HotSpotID kCaldoriaVidPhoneOutSpotID = 5017; +static const HotSpotID kCaBedroomVidPhoneActivationSpotID = 5018; +static const HotSpotID kCaldoriaReplicatorOutSpotID = 5019; +static const HotSpotID kCaldoriaMakeOJSpotID = 5020; +static const HotSpotID kCaldoriaMakeStickyBunsSpotID = 5021; +static const HotSpotID kCaldoriaOrangeJuiceSpotID = 5022; +static const HotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023; +static const HotSpotID kCaldoriaDrawersOutSpotID = 5024; +static const HotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025; +static const HotSpotID kCaldoriaRightDrawerOpenSpotID = 5026; +static const HotSpotID kCaldoriaKeyCardSpotID = 5027; +static const HotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028; +static const HotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029; +static const HotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030; +static const HotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031; +static const HotSpotID kCaldoria20DoorbellSpotID = 5032; +static const HotSpotID kCaldoria21DoorbellSpotID = 5033; +static const HotSpotID kCaldoria26DoorbellSpotID = 5034; +static const HotSpotID kCaldoriaFourthFloorElevator1 = 5035; +static const HotSpotID kCaldoriaFourthFloorElevator2 = 5036; +static const HotSpotID kCaldoriaFourthFloorElevator3 = 5037; +static const HotSpotID kCaldoriaFourthFloorElevator4 = 5038; +static const HotSpotID kCaldoriaFourthFloorElevator5 = 5039; +static const HotSpotID kCaldoriaGroundElevator1 = 5040; +static const HotSpotID kCaldoriaGroundElevator2 = 5041; +static const HotSpotID kCaldoriaGroundElevator3 = 5042; +static const HotSpotID kCaldoriaGroundElevator4 = 5043; +static const HotSpotID kCaldoriaGroundElevator5 = 5044; +static const HotSpotID kCaldoria29DoorbellSpotID = 5045; +static const HotSpotID kCaldoria34DoorbellSpotID = 5046; +static const HotSpotID kCaldoria35DoorbellSpotID = 5047; +static const HotSpotID kCaldoriaGroundElevatorSpotID = 5048; +static const HotSpotID kCaldoriaBinocularZoomInSpotID = 5049; +static const HotSpotID kCaldoriaBinocularsOutSpotID = 5050; +static const HotSpotID kCaldoriaZoomInOnShipSpotID = 5051; +static const HotSpotID kCaldoriaKioskSpotID = 5052; +static const HotSpotID kCaldoriaKioskOutSpotID = 5053; +static const HotSpotID kCaldoriaKioskInfoSpotID = 5054; +static const HotSpotID kCaldoriaGTCardDropSpotID = 5055; +static const HotSpotID kCaldoriaGTTokyoSpotID = 5056; +static const HotSpotID kCaldoriaGTTSASpotID = 5057; +static const HotSpotID kCaldoriaGTBeachSpotID = 5058; +static const HotSpotID kCaldoriaGTOtherSpotID = 5059; +static const HotSpotID kCaldoriaRoofElevator1 = 5060; +static const HotSpotID kCaldoriaRoofElevator2 = 5061; +static const HotSpotID kCaldoriaRoofElevator3 = 5062; +static const HotSpotID kCaldoriaRoofElevator4 = 5063; +static const HotSpotID kCaldoriaRoofElevator5 = 5064; +static const HotSpotID kCaldoriaRoofElevatorSpotID = 5065; +static const HotSpotID kCaldoriaRoofDoorSpotID = 5066; +static const HotSpotID kCaldoriaRoofCardDropSpotID = 5067; +static const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; // Extra sequence IDs. -const ExtraID kCaldoriaWakeUpView1 = 0; -const ExtraID kCaldoria00WakeUp1 = 1; -const ExtraID kCaldoria00WakeUp2 = 2; -const ExtraID kCaldoria00SitDown = 3; -const ExtraID k4DEnvironOpenToINN = 4; -const ExtraID k4DINNInterruption = 5; -const ExtraID k4DINNIntro = 6; -const ExtraID k4DINNMarkJohnson = 7; -const ExtraID k4DINNMeganLove = 8; -const ExtraID k4DINNFadeOut = 9; -const ExtraID k4DEnvironOpenFromINN = 10; -const ExtraID k4DEnvironOpen = 11; -const ExtraID k4DEnvironOpenView = 12; -const ExtraID k4DEnvironClose = 13; -const ExtraID k4DIslandLoop = 14; -const ExtraID k4DDesertLoop = 15; -const ExtraID k4DMountainLoop = 16; -const ExtraID k4DIsland1ToIsland0 = 17; -const ExtraID k4DIsland2ToIsland0 = 18; -const ExtraID k4DIsland0ToDesert0 = 19; -const ExtraID k4DIsland1ToDesert0 = 20; -const ExtraID k4DIsland2ToDesert0 = 21; -const ExtraID k4DIsland0ToMountain0 = 22; -const ExtraID k4DIsland1ToMountain0 = 23; -const ExtraID k4DIsland2ToMountain0 = 24; -const ExtraID k4DDesert0ToIsland0 = 25; -const ExtraID k4DDesert1ToIsland0 = 26; -const ExtraID k4DDesert2ToIsland0 = 27; -const ExtraID k4DDesert0ToMountain0 = 28; -const ExtraID k4DDesert1ToMountain0 = 29; -const ExtraID k4DDesert2ToMountain0 = 30; -const ExtraID k4DMountain0ToIsland0 = 31; -const ExtraID k4DMountain1ToIsland0 = 32; -const ExtraID k4DMountain2ToIsland0 = 33; -const ExtraID k4DMountain0ToDesert0 = 34; -const ExtraID k4DMountain1ToDesert0 = 35; -const ExtraID k4DMountain2ToDesert0 = 36; -const ExtraID kCaBathroomGreeting = 37; -const ExtraID kCaBathroomBodyFat = 38; -const ExtraID kCaBathroomStylistIntro = 39; -const ExtraID kCaBathroomRetrothrash = 40; -const ExtraID kCaBathroomRetrothrashReturn = 41; -const ExtraID kCaBathroomGeoWave = 42; -const ExtraID kCaBathroomGeoWaveReturn = 43; -const ExtraID kCaBathroomAgencyStandard = 44; -const ExtraID kCaldoriaShowerTitle = 45; -const ExtraID kCaldoriaShowerButton = 46; -const ExtraID kCaldoriaShowerDown = 47; -const ExtraID kCaldoriaShowerUp = 48; -const ExtraID kCaBedroomVidPhone = 49; -const ExtraID kCaBedroomMessage1 = 50; -const ExtraID kCaBedroomMessage2 = 51; -const ExtraID kCreateOrangeJuice = 52; -const ExtraID kDisposeOrangeJuice = 53; -const ExtraID kReplicatorNorthViewWithOJ = 54; -const ExtraID kLeftDrawerOpen = 55; -const ExtraID kLeftDrawerClose = 56; -const ExtraID kRightDrawerOpenWithKeys = 57; -const ExtraID kRightDrawerCloseWithKeys = 58; -const ExtraID kRightDrawerOpenNoKeys = 59; -const ExtraID kRightDrawerCloseNoKeys = 60; -const ExtraID kRightDrawerOpenViewWithKeys = 61; -const ExtraID kRightDrawerOpenViewNoKeys = 62; -const ExtraID kCaldoria16ElevatorUp = 63; -const ExtraID kCaldoria16ElevatorDown = 64; -const ExtraID kCaldoria16SouthViewWithElevator = 65; -const ExtraID kCaldoria20Doorbell = 66; -const ExtraID kCaldoria21Doorbell = 67; -const ExtraID kCaldoria26Doorbell = 68; -const ExtraID kCaldoriaFourthToGround = 69; -const ExtraID kCaldoriaRoofToFourth = 70; -const ExtraID kCaldoriaRoofToGround = 71; -const ExtraID kCaldoriaGroundToFourth = 72; -const ExtraID kCaldoriaGroundToRoof = 73; -const ExtraID kCaldoriaFourthToRoof = 74; -const ExtraID kCaldoria29Doorbell = 75; -const ExtraID kCaldoria34Doorbell = 76; -const ExtraID kCaldoria35Doorbell = 77; -const ExtraID kBinocularsZoomInOnShip = 78; -const ExtraID kCaldoriaKioskVideo = 79; -const ExtraID kCaldoriaTransporterArrowLoop = 80; -const ExtraID kArriveAtCaldoriaFromTSA = 81; -const ExtraID kCaGTOtherChoice = 82; -const ExtraID kCaGTCardSwipe = 83; -const ExtraID kCaGTSelectTSA = 84; -const ExtraID kCaGTFryTheFly = 85; -const ExtraID kCaGTGoToTSA = 86; -const ExtraID kCaGTSelectBeach = 87; -const ExtraID kCaGTGoToBeach = 88; -const ExtraID kCaGTArriveAtBeach = 89; -const ExtraID kCaGTSelectTokyo = 90; -const ExtraID kCaGTGoToTokyo = 91; -const ExtraID kCaGTArriveAtTokyo = 92; -const ExtraID kCa48NorthRooftopClosed = 93; -const ExtraID kCa48NorthExplosion = 94; -const ExtraID kCa48NorthExplosionDeath = 95; -const ExtraID kCa49NorthVoiceAnalysis = 96; -const ExtraID kCa50SinclairShoots = 97; -const ExtraID kCa53EastZoomToSinclair = 98; -const ExtraID kCa53EastDeath2 = 99; -const ExtraID kCa53EastShootSinclair = 100; -const ExtraID kCa53EastZoomOutFromSinclair = 101; -const ExtraID kCa54SouthDeath = 102; -const ExtraID kCaldoria56BombStage1 = 103; -const ExtraID kCaldoria56BombStage2 = 104; -const ExtraID kCaldoria56BombStage3 = 105; -const ExtraID kCaldoria56BombStage4 = 106; -const ExtraID kCaldoria56BombStage5 = 107; -const ExtraID kCaldoria56BombStage6 = 108; -const ExtraID kCaldoria56BombStage7 = 109; -const ExtraID kCaldoria56BombExplodes = 110; +static const ExtraID kCaldoriaWakeUpView1 = 0; +static const ExtraID kCaldoria00WakeUp1 = 1; +static const ExtraID kCaldoria00WakeUp2 = 2; +static const ExtraID kCaldoria00SitDown = 3; +static const ExtraID k4DEnvironOpenToINN = 4; +static const ExtraID k4DINNInterruption = 5; +static const ExtraID k4DINNIntro = 6; +static const ExtraID k4DINNMarkJohnson = 7; +static const ExtraID k4DINNMeganLove = 8; +static const ExtraID k4DINNFadeOut = 9; +static const ExtraID k4DEnvironOpenFromINN = 10; +static const ExtraID k4DEnvironOpen = 11; +static const ExtraID k4DEnvironOpenView = 12; +static const ExtraID k4DEnvironClose = 13; +static const ExtraID k4DIslandLoop = 14; +static const ExtraID k4DDesertLoop = 15; +static const ExtraID k4DMountainLoop = 16; +static const ExtraID k4DIsland1ToIsland0 = 17; +static const ExtraID k4DIsland2ToIsland0 = 18; +static const ExtraID k4DIsland0ToDesert0 = 19; +static const ExtraID k4DIsland1ToDesert0 = 20; +static const ExtraID k4DIsland2ToDesert0 = 21; +static const ExtraID k4DIsland0ToMountain0 = 22; +static const ExtraID k4DIsland1ToMountain0 = 23; +static const ExtraID k4DIsland2ToMountain0 = 24; +static const ExtraID k4DDesert0ToIsland0 = 25; +static const ExtraID k4DDesert1ToIsland0 = 26; +static const ExtraID k4DDesert2ToIsland0 = 27; +static const ExtraID k4DDesert0ToMountain0 = 28; +static const ExtraID k4DDesert1ToMountain0 = 29; +static const ExtraID k4DDesert2ToMountain0 = 30; +static const ExtraID k4DMountain0ToIsland0 = 31; +static const ExtraID k4DMountain1ToIsland0 = 32; +static const ExtraID k4DMountain2ToIsland0 = 33; +static const ExtraID k4DMountain0ToDesert0 = 34; +static const ExtraID k4DMountain1ToDesert0 = 35; +static const ExtraID k4DMountain2ToDesert0 = 36; +static const ExtraID kCaBathroomGreeting = 37; +static const ExtraID kCaBathroomBodyFat = 38; +static const ExtraID kCaBathroomStylistIntro = 39; +static const ExtraID kCaBathroomRetrothrash = 40; +static const ExtraID kCaBathroomRetrothrashReturn = 41; +static const ExtraID kCaBathroomGeoWave = 42; +static const ExtraID kCaBathroomGeoWaveReturn = 43; +static const ExtraID kCaBathroomAgencyStandard = 44; +static const ExtraID kCaldoriaShowerTitle = 45; +static const ExtraID kCaldoriaShowerButton = 46; +static const ExtraID kCaldoriaShowerDown = 47; +static const ExtraID kCaldoriaShowerUp = 48; +static const ExtraID kCaBedroomVidPhone = 49; +static const ExtraID kCaBedroomMessage1 = 50; +static const ExtraID kCaBedroomMessage2 = 51; +static const ExtraID kCreateOrangeJuice = 52; +static const ExtraID kDisposeOrangeJuice = 53; +static const ExtraID kReplicatorNorthViewWithOJ = 54; +static const ExtraID kLeftDrawerOpen = 55; +static const ExtraID kLeftDrawerClose = 56; +static const ExtraID kRightDrawerOpenWithKeys = 57; +static const ExtraID kRightDrawerCloseWithKeys = 58; +static const ExtraID kRightDrawerOpenNoKeys = 59; +static const ExtraID kRightDrawerCloseNoKeys = 60; +static const ExtraID kRightDrawerOpenViewWithKeys = 61; +static const ExtraID kRightDrawerOpenViewNoKeys = 62; +static const ExtraID kCaldoria16ElevatorUp = 63; +static const ExtraID kCaldoria16ElevatorDown = 64; +static const ExtraID kCaldoria16SouthViewWithElevator = 65; +static const ExtraID kCaldoria20Doorbell = 66; +static const ExtraID kCaldoria21Doorbell = 67; +static const ExtraID kCaldoria26Doorbell = 68; +static const ExtraID kCaldoriaFourthToGround = 69; +static const ExtraID kCaldoriaRoofToFourth = 70; +static const ExtraID kCaldoriaRoofToGround = 71; +static const ExtraID kCaldoriaGroundToFourth = 72; +static const ExtraID kCaldoriaGroundToRoof = 73; +static const ExtraID kCaldoriaFourthToRoof = 74; +static const ExtraID kCaldoria29Doorbell = 75; +static const ExtraID kCaldoria34Doorbell = 76; +static const ExtraID kCaldoria35Doorbell = 77; +static const ExtraID kBinocularsZoomInOnShip = 78; +static const ExtraID kCaldoriaKioskVideo = 79; +static const ExtraID kCaldoriaTransporterArrowLoop = 80; +static const ExtraID kArriveAtCaldoriaFromTSA = 81; +static const ExtraID kCaGTOtherChoice = 82; +static const ExtraID kCaGTCardSwipe = 83; +static const ExtraID kCaGTSelectTSA = 84; +static const ExtraID kCaGTFryTheFly = 85; +static const ExtraID kCaGTGoToTSA = 86; +static const ExtraID kCaGTSelectBeach = 87; +static const ExtraID kCaGTGoToBeach = 88; +static const ExtraID kCaGTArriveAtBeach = 89; +static const ExtraID kCaGTSelectTokyo = 90; +static const ExtraID kCaGTGoToTokyo = 91; +static const ExtraID kCaGTArriveAtTokyo = 92; +static const ExtraID kCa48NorthRooftopClosed = 93; +static const ExtraID kCa48NorthExplosion = 94; +static const ExtraID kCa48NorthExplosionDeath = 95; +static const ExtraID kCa49NorthVoiceAnalysis = 96; +static const ExtraID kCa50SinclairShoots = 97; +static const ExtraID kCa53EastZoomToSinclair = 98; +static const ExtraID kCa53EastDeath2 = 99; +static const ExtraID kCa53EastShootSinclair = 100; +static const ExtraID kCa53EastZoomOutFromSinclair = 101; +static const ExtraID kCa54SouthDeath = 102; +static const ExtraID kCaldoria56BombStage1 = 103; +static const ExtraID kCaldoria56BombStage2 = 104; +static const ExtraID kCaldoria56BombStage3 = 105; +static const ExtraID kCaldoria56BombStage4 = 106; +static const ExtraID kCaldoria56BombStage5 = 107; +static const ExtraID kCaldoria56BombStage6 = 108; +static const ExtraID kCaldoria56BombStage7 = 109; +static const ExtraID kCaldoria56BombExplodes = 110; // Caldoria interactions. -const InteractionID kCaldoria4DInteractionID = 0; -const InteractionID kCaldoriaBombInteractionID = 1; -const InteractionID kCaldoriaMessagesInteractionID = 2; -const InteractionID kCaldoriaMirrorInteractionID = 3; +static const InteractionID kCaldoria4DInteractionID = 0; +static const InteractionID kCaldoriaBombInteractionID = 1; +static const InteractionID kCaldoriaMessagesInteractionID = 2; +static const InteractionID kCaldoriaMirrorInteractionID = 3; // Caldoria: -const DisplayOrder kVidPhoneOrder = kMonitorLayer; -const DisplayOrder k4DSpritesOrder = kMonitorLayer; -const DisplayOrder kCaldoriaMessagesOrder = kMonitorLayer; -const DisplayOrder kCaldoriaElevatorOrder = kMonitorLayer; -const DisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer; -const DisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer; -const DisplayOrder kCaldoriaBombGridOrder = kMonitorLayer; -const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; +static const DisplayOrder kVidPhoneOrder = kMonitorLayer; +static const DisplayOrder k4DSpritesOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaMessagesOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaElevatorOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaBombGridOrder = kMonitorLayer; +static const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; ///////////////////////////////////////////// // // Caldoria -const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; -const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; +static const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; +static const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; -const CoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10; -const CoordType kCaldoria4DSpritesTop = kNavAreaTop + 142; +static const CoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10; +static const CoordType kCaldoria4DSpritesTop = kNavAreaTop + 142; -const CoordType kCaldoriaMessageLeft = kNavAreaLeft + 202; -const CoordType kCaldoriaMessageTop = kNavAreaTop + 26; +static const CoordType kCaldoriaMessageLeft = kNavAreaLeft + 202; +static const CoordType kCaldoriaMessageTop = kNavAreaTop + 26; -const CoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407; -const CoordType kCaldoriaElevatorTop = kNavAreaTop + 138; +static const CoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407; +static const CoordType kCaldoriaElevatorTop = kNavAreaTop + 138; -const CoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213; -const CoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215; +static const CoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213; +static const CoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215; -const CoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414; -const CoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215; +static const CoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414; +static const CoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215; -const CoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276; -const CoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115; +static const CoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276; +static const CoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115; -const CoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135; -const CoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214; +static const CoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135; +static const CoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214; -const CoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209; -const CoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170; +static const CoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209; +static const CoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170; -const CoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480; -const CoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191; +static const CoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480; +static const CoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191; -const CoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248; -const CoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191; +static const CoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248; +static const CoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191; -const CoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337; -const CoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205; +static const CoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337; +static const CoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205; -const CoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290; -const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58; +static const CoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290; +static const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58; -const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; -const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; +static const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; +static const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; // Caldoria display IDs. -const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; -const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; -const DisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1; -const DisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1; -const DisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1; -const DisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1; +static const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; +static const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; +static const DisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1; +static const DisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1; +static const DisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1; +static const DisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1; -const TimeValue kCaldoria4DBlankChoiceIn = 29730; -const TimeValue kCaldoria4DBlankChoiceOut = 33910; +static const TimeValue kCaldoria4DBlankChoiceIn = 29730; +static const TimeValue kCaldoria4DBlankChoiceOut = 33910; class Caldoria; diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp index 31a102a061..0326bb7bb1 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp @@ -29,34 +29,34 @@ namespace Pegasus { -const TimeValue kSwitchableSlop = 3 * kCaldoriaFrameDuration; +static const TimeValue kSwitchableSlop = 3 * kCaldoriaFrameDuration; // Two seconds - some slop -const TimeValue kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop; +static const TimeValue kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop; // Twelve frames + some slop -const TimeValue kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop; +static const TimeValue kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop; -const TimeValue kSwitchable1Start = 0; -const TimeValue kSwitchable1Stop = kSwitchable1Start + kSwitchableDuration; +static const TimeValue kSwitchable1Start = 0; +static const TimeValue kSwitchable1Stop = kSwitchable1Start + kSwitchableDuration; -const TimeValue kSwitchable2Start = kSwitchable1Stop + kNonswitchableDuration; -const TimeValue kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration; +static const TimeValue kSwitchable2Start = kSwitchable1Stop + kNonswitchableDuration; +static const TimeValue kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration; -const TimeValue kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration; -const TimeValue kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration; +static const TimeValue kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration; +static const TimeValue kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration; -const NotificationFlags kVidPhoneDoneFlag = 1; +static const NotificationFlags kVidPhoneDoneFlag = 1; -const TimeValue kRockMusicLoopIn = 0; -const TimeValue kRockMusicLoopOut = 2088; +static const TimeValue kRockMusicLoopIn = 0; +static const TimeValue kRockMusicLoopOut = 2088; -const TimeValue kOrchestralMusicLoopIn = 2088; -const TimeValue kOrchestralMusicLoopOut = 4985; +static const TimeValue kOrchestralMusicLoopIn = 2088; +static const TimeValue kOrchestralMusicLoopOut = 4985; -const TimeValue kRhythmsMusicLoopIn = 4985; -const TimeValue kRhythmsMusicLoopOut = 6824; +static const TimeValue kRhythmsMusicLoopIn = 4985; +static const TimeValue kRhythmsMusicLoopOut = 6824; -const TimeValue kAcousticMusicLoopIn = 6824; -const TimeValue kAcousticMusicLoopOut = 9387; +static const TimeValue kAcousticMusicLoopIn = 6824; +static const TimeValue kAcousticMusicLoopOut = 9387; enum { k4DVideoMenu, diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp index 3e97f97904..5b9a823f7c 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp @@ -30,7 +30,7 @@ namespace Pegasus { -const NotificationFlags kMessageDoneFlag = 1; +static const NotificationFlags kMessageDoneFlag = 1; CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const NotificationID id, NotificationManager *manager) : GameInteraction(kCaldoriaMessagesInteractionID, owner), Notification(id, manager), _messageMovie(kCaldoriaMessagesID) { diff --git a/engines/pegasus/neighborhood/door.h b/engines/pegasus/neighborhood/door.h index 74e9ac8441..55c36b659a 100755 --- a/engines/pegasus/neighborhood/door.h +++ b/engines/pegasus/neighborhood/door.h @@ -44,9 +44,9 @@ enum { kDoorLockedBit // Bit set if door is locked, clear if unlocked. }; -const DoorFlags kNoDoorFlags = 0; -const DoorFlags kDoorPresentMask = 1 << kDoorPresentBit; -const DoorFlags kDoorLockedMask = 1 << kDoorLockedBit; +static const DoorFlags kNoDoorFlags = 0; +static const DoorFlags kDoorPresentMask = 1 << kDoorPresentBit; +static const DoorFlags kDoorLockedMask = 1 << kDoorLockedBit; class DoorTable { public: diff --git a/engines/pegasus/neighborhood/mars/constants.h b/engines/pegasus/neighborhood/mars/constants.h index 103518664c..b1013dacc5 100755 --- a/engines/pegasus/neighborhood/mars/constants.h +++ b/engines/pegasus/neighborhood/mars/constants.h @@ -32,909 +32,909 @@ namespace Pegasus { // Element Coordinates -const CoordType kUndoHiliteLeft = kNavAreaLeft + 140; -const CoordType kUndoHiliteTop = kNavAreaTop + 36; +static const CoordType kUndoHiliteLeft = kNavAreaLeft + 140; +static const CoordType kUndoHiliteTop = kNavAreaTop + 36; -const CoordType kCurrentGuessLeft = kNavAreaLeft + 146; -const CoordType kCurrentGuessTop = kNavAreaTop + 90; +static const CoordType kCurrentGuessLeft = kNavAreaLeft + 146; +static const CoordType kCurrentGuessTop = kNavAreaTop + 90; -const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; -const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; +static const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116; +static const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158; -const CoordType kReactorHistoryLeft = kNavAreaLeft + 302; -const CoordType kReactorHistoryTop = kNavAreaTop + 39; +static const CoordType kReactorHistoryLeft = kNavAreaLeft + 302; +static const CoordType kReactorHistoryTop = kNavAreaTop + 39; -const CoordType kAnswerLeft = kNavAreaLeft + 304; -const CoordType kAnswerTop = kNavAreaTop + 180; +static const CoordType kAnswerLeft = kNavAreaLeft + 304; +static const CoordType kAnswerTop = kNavAreaTop + 180; -const CoordType kShuttle1Left = 0; -const CoordType kShuttle1Top = 0; +static const CoordType kShuttle1Left = 0; +static const CoordType kShuttle1Top = 0; -const CoordType kShuttle2Left = 0; -const CoordType kShuttle2Top = 96; +static const CoordType kShuttle2Left = 0; +static const CoordType kShuttle2Top = 96; -const CoordType kShuttle3Left = 500; -const CoordType kShuttle3Top = 96; +static const CoordType kShuttle3Left = 500; +static const CoordType kShuttle3Top = 96; -const CoordType kShuttle4Left = 0; -const CoordType kShuttle4Top = 320; +static const CoordType kShuttle4Left = 0; +static const CoordType kShuttle4Top = 320; -const CoordType kShuttleWindowLeft = 140; -const CoordType kShuttleWindowTop = 96; -const CoordType kShuttleWindowWidth = 360; -const CoordType kShuttleWindowHeight = 224; +static const CoordType kShuttleWindowLeft = 140; +static const CoordType kShuttleWindowTop = 96; +static const CoordType kShuttleWindowWidth = 360; +static const CoordType kShuttleWindowHeight = 224; -const CoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2; -const CoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2; +static const CoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2; +static const CoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2; -const CoordType kShuttleLeftLeft = 0; -const CoordType kShuttleLeftTop = 128; +static const CoordType kShuttleLeftLeft = 0; +static const CoordType kShuttleLeftTop = 128; -const CoordType kShuttleRightLeft = 506; -const CoordType kShuttleRightTop = 128; +static const CoordType kShuttleRightLeft = 506; +static const CoordType kShuttleRightTop = 128; -const CoordType kShuttleLowerLeftLeft = 74; -const CoordType kShuttleLowerLeftTop = 358; +static const CoordType kShuttleLowerLeftLeft = 74; +static const CoordType kShuttleLowerLeftTop = 358; -const CoordType kShuttleLowerRightLeft = 486; -const CoordType kShuttleLowerRightTop = 354; +static const CoordType kShuttleLowerRightLeft = 486; +static const CoordType kShuttleLowerRightTop = 354; -const CoordType kShuttleCenterLeft = 260; -const CoordType kShuttleCenterTop = 336; +static const CoordType kShuttleCenterLeft = 260; +static const CoordType kShuttleCenterTop = 336; -const CoordType kShuttleUpperLeftLeft = 30; -const CoordType kShuttleUpperLeftTop = 32; +static const CoordType kShuttleUpperLeftLeft = 30; +static const CoordType kShuttleUpperLeftTop = 32; -const CoordType kShuttleUpperRightLeft = 506; -const CoordType kShuttleUpperRightTop = 52; +static const CoordType kShuttleUpperRightLeft = 506; +static const CoordType kShuttleUpperRightTop = 52; -const CoordType kShuttleLeftEnergyLeft = 110; -const CoordType kShuttleLeftEnergyTop = 186; +static const CoordType kShuttleLeftEnergyLeft = 110; +static const CoordType kShuttleLeftEnergyTop = 186; -const CoordType kShuttleRightEnergyLeft = 510; -const CoordType kShuttleRightEnergyTop = 186; +static const CoordType kShuttleRightEnergyLeft = 510; +static const CoordType kShuttleRightEnergyTop = 186; -const CoordType kShuttleEnergyLeft = 186; -const CoordType kShuttleEnergyTop = 60; -const CoordType kShuttleEnergyWidth = 252; -const CoordType kShuttleEnergyHeight = 22; +static const CoordType kShuttleEnergyLeft = 186; +static const CoordType kShuttleEnergyTop = 60; +static const CoordType kShuttleEnergyWidth = 252; +static const CoordType kShuttleEnergyHeight = 22; -const CoordType kPlanetStartLeft = kShuttleWindowLeft; -const CoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight; +static const CoordType kPlanetStartLeft = kShuttleWindowLeft; +static const CoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight; -const CoordType kPlanetStopLeft = kShuttleWindowLeft; -const CoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100; +static const CoordType kPlanetStopLeft = kShuttleWindowLeft; +static const CoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100; -const CoordType kShuttleTractorLeft = kShuttleWindowLeft + 6; -const CoordType kShuttleTractorTop = kShuttleWindowTop + 56; -const CoordType kShuttleTractorWidth = 348; -const CoordType kShuttleTractorHeight = 112; +static const CoordType kShuttleTractorLeft = kShuttleWindowLeft + 6; +static const CoordType kShuttleTractorTop = kShuttleWindowTop + 56; +static const CoordType kShuttleTractorWidth = 348; +static const CoordType kShuttleTractorHeight = 112; -const CoordType kShuttleJunkLeft = kShuttleWindowLeft + 6; -const CoordType kShuttleJunkTop = kShuttleWindowTop + 6; +static const CoordType kShuttleJunkLeft = kShuttleWindowLeft + 6; +static const CoordType kShuttleJunkTop = kShuttleWindowTop + 6; -const DisplayOrder kShuttlePlanetOrder = kInterfaceLayer; -const DisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1; -const DisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1; -const DisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1; -const DisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1; -const DisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1; -const DisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1; -const DisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1; -const DisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1; -const DisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1; -const DisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1; -const DisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1; +static const DisplayOrder kShuttlePlanetOrder = kInterfaceLayer; +static const DisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1; +static const DisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1; +static const DisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1; +static const DisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1; +static const DisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1; +static const DisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1; +static const DisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1; +static const DisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1; +static const DisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1; +static const DisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1; +static const DisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1; -const TimeValue kShuttleSwingStart = 0; -const TimeValue kShuttleSwingStop = 5 * 600; +static const TimeValue kShuttleSwingStart = 0; +static const TimeValue kShuttleSwingStop = 5 * 600; -const TimeValue kCanyonChaseStart = kShuttleSwingStop; -const TimeValue kCanyonChaseStop = 60 * 600 + 43 * 600 + 14 * 40; +static const TimeValue kCanyonChaseStart = kShuttleSwingStop; +static const TimeValue kCanyonChaseStop = 60 * 600 + 43 * 600 + 14 * 40; -const TimeValue kLaunchTubeReachedTime = 60 * 600 + 38 * 600 - kCanyonChaseStart; -const TimeValue kCanyonChaseFinishedTime = kCanyonChaseStop - kCanyonChaseStart - +static const TimeValue kLaunchTubeReachedTime = 60 * 600 + 38 * 600 - kCanyonChaseStart; +static const TimeValue kCanyonChaseFinishedTime = kCanyonChaseStop - kCanyonChaseStart - kLaunchTubeReachedTime; // Left shuttle. -const TimeValue kShuttleLeftIntroStart = 0; -const TimeValue kShuttleLeftIntroStop = 400; +static const TimeValue kShuttleLeftIntroStart = 0; +static const TimeValue kShuttleLeftIntroStop = 400; -const TimeValue kShuttleLeftBlankTime = 400; +static const TimeValue kShuttleLeftBlankTime = 400; -const TimeValue kShuttleLeftNormalTime = 440; +static const TimeValue kShuttleLeftNormalTime = 440; -const TimeValue kShuttleLeftAutoTestTime = 480; +static const TimeValue kShuttleLeftAutoTestTime = 480; -const TimeValue kShuttleLeftDamagedTime = 520; +static const TimeValue kShuttleLeftDamagedTime = 520; -const TimeValue kShuttleLeftDampingTime = 560; +static const TimeValue kShuttleLeftDampingTime = 560; -const TimeValue kShuttleLeftGravitonTime = 600; +static const TimeValue kShuttleLeftGravitonTime = 600; -const TimeValue kShuttleLeftTractorTime = 640; +static const TimeValue kShuttleLeftTractorTime = 640; // Right shuttle. -const TimeValue kShuttleRightIntroStart = 0; -const TimeValue kShuttleRightIntroStop = 400; +static const TimeValue kShuttleRightIntroStart = 0; +static const TimeValue kShuttleRightIntroStop = 400; -const TimeValue kShuttleRightDestroyedStart = 400; -const TimeValue kShuttleRightDestroyedStop = 840; +static const TimeValue kShuttleRightDestroyedStart = 400; +static const TimeValue kShuttleRightDestroyedStop = 840; -const TimeValue kShuttleRightBlankTime = 840; +static const TimeValue kShuttleRightBlankTime = 840; -const TimeValue kShuttleRightNormalTime = 880; +static const TimeValue kShuttleRightNormalTime = 880; -const TimeValue kShuttleRightDamagedTime = 920; +static const TimeValue kShuttleRightDamagedTime = 920; -const TimeValue kShuttleRightTargetLockTime = 960; +static const TimeValue kShuttleRightTargetLockTime = 960; -const TimeValue kShuttleRightGravitonTime = 1000; +static const TimeValue kShuttleRightGravitonTime = 1000; -const TimeValue kShuttleRightOverloadTime = 1040; +static const TimeValue kShuttleRightOverloadTime = 1040; // Lower Left shuttle. -const TimeValue kShuttleLowerLeftCollisionTime = 0; +static const TimeValue kShuttleLowerLeftCollisionTime = 0; -const TimeValue kShuttleLowerLeftTubeTime = 40; +static const TimeValue kShuttleLowerLeftTubeTime = 40; -const TimeValue kShuttleLowerLeftAutopilotTime = 80; +static const TimeValue kShuttleLowerLeftAutopilotTime = 80; // Lower Right shuttle. -const TimeValue kShuttleLowerRightOffTime = 0; +static const TimeValue kShuttleLowerRightOffTime = 0; -const TimeValue kShuttleLowerRightTrackingTime = 40; +static const TimeValue kShuttleLowerRightTrackingTime = 40; -const TimeValue kShuttleLowerRightTransportTime = 80; +static const TimeValue kShuttleLowerRightTransportTime = 80; -const TimeValue kShuttleLowerRightTransportHiliteTime = 120; +static const TimeValue kShuttleLowerRightTransportHiliteTime = 120; // Center shuttle. -const TimeValue kShuttleCenterBoardingTime = 0; +static const TimeValue kShuttleCenterBoardingTime = 0; -const TimeValue kShuttleCenterCheckTime = 40; +static const TimeValue kShuttleCenterCheckTime = 40; -const TimeValue kShuttleCenterNavCompTime = 80; +static const TimeValue kShuttleCenterNavCompTime = 80; -const TimeValue kShuttleCenterCommTime = 120; +static const TimeValue kShuttleCenterCommTime = 120; -const TimeValue kShuttleCenterWeaponsTime = 160; +static const TimeValue kShuttleCenterWeaponsTime = 160; -const TimeValue kShuttleCenterAllSystemsTime = 200; +static const TimeValue kShuttleCenterAllSystemsTime = 200; -const TimeValue kShuttleCenterSecureLooseTime = 240; +static const TimeValue kShuttleCenterSecureLooseTime = 240; -const TimeValue kShuttleCenterAutoTestTime = 280; +static const TimeValue kShuttleCenterAutoTestTime = 280; -const TimeValue kShuttleCenterLaunchTime = 320; +static const TimeValue kShuttleCenterLaunchTime = 320; -const TimeValue kShuttleCenterEnterTubeTime = 360; +static const TimeValue kShuttleCenterEnterTubeTime = 360; -const TimeValue kShuttleCenterTargetSightedTime = 400; +static const TimeValue kShuttleCenterTargetSightedTime = 400; -const TimeValue kShuttleCenterVerifyingTime = 440; +static const TimeValue kShuttleCenterVerifyingTime = 440; -const TimeValue kShuttleCenterScanningTime = 480; +static const TimeValue kShuttleCenterScanningTime = 480; -const TimeValue kShuttleCenterSafeTime = 520; +static const TimeValue kShuttleCenterSafeTime = 520; // Upper Left shuttle. -const TimeValue kShuttleUpperLeftDimTime = 0; +static const TimeValue kShuttleUpperLeftDimTime = 0; -const TimeValue kShuttleUpperLeftDampingTime = 40; +static const TimeValue kShuttleUpperLeftDampingTime = 40; -const TimeValue kShuttleUpperLeftGravitonTime = 80; +static const TimeValue kShuttleUpperLeftGravitonTime = 80; -const TimeValue kShuttleUpperLeftTractorTime = 120; +static const TimeValue kShuttleUpperLeftTractorTime = 120; // Upper Right shuttle. -const TimeValue kShuttleUpperRightLockedTime = 0; +static const TimeValue kShuttleUpperRightLockedTime = 0; -const TimeValue kShuttleUpperRightArmedTime = 40; +static const TimeValue kShuttleUpperRightArmedTime = 40; -const TimeValue kShuttleUpperRightAlienDestroyedTime = 80; +static const TimeValue kShuttleUpperRightAlienDestroyedTime = 80; -const TimeValue kShuttleUpperRightOverloadTime = 120; +static const TimeValue kShuttleUpperRightOverloadTime = 120; -const TimeValue kShuttleUpperRightTargetDestroyedTime = 160; +static const TimeValue kShuttleUpperRightTargetDestroyedTime = 160; // Shuttle distance -const int kShuttleDistance = 500; +static const int kShuttleDistance = 500; -const int kJunkMaxDistance = kShuttleDistance; -const int kJunkMinDistance = 40; +static const int kJunkMaxDistance = kShuttleDistance; +static const int kJunkMinDistance = 40; -const int kEnergyBeamMaxDistance = kShuttleDistance; -const int kEnergyBeamMinDistance = 40; +static const int kEnergyBeamMaxDistance = kShuttleDistance; +static const int kEnergyBeamMinDistance = 40; -const int kGravitonMaxDistance = kShuttleDistance; -const int kGravitonMinDistance = 40; +static const int kGravitonMaxDistance = kShuttleDistance; +static const int kGravitonMinDistance = 40; -const TimeValue kMarsOxyMaskOnIn = 0; -const TimeValue kMarsOxyMaskOnOut = 1560; +static const TimeValue kMarsOxyMaskOnIn = 0; +static const TimeValue kMarsOxyMaskOnOut = 1560; -const TimeValue kMarsAirlockButtonBeepIn = 1560; -const TimeValue kMarsAirlockButtonBeepOut = 1620; +static const TimeValue kMarsAirlockButtonBeepIn = 1560; +static const TimeValue kMarsAirlockButtonBeepOut = 1620; -const TimeValue kMarsColorMatchingButtonBeepIn = 1620; -const TimeValue kMarsColorMatchingButtonBeepOut = 1680; +static const TimeValue kMarsColorMatchingButtonBeepIn = 1620; +static const TimeValue kMarsColorMatchingButtonBeepOut = 1680; -const TimeValue kMarsKioskBeepIn = 1680; -const TimeValue kMarsKioskBeepOut = 1740; +static const TimeValue kMarsKioskBeepIn = 1680; +static const TimeValue kMarsKioskBeepOut = 1740; -const TimeValue kMarsBumpIntoWallIn = 1740; -const TimeValue kMarsBumpIntoWallOut = 1888; +static const TimeValue kMarsBumpIntoWallIn = 1740; +static const TimeValue kMarsBumpIntoWallOut = 1888; -const TimeValue kMarsGantryDoorCloseIn = 1888; -const TimeValue kMarsGantryDoorCloseOut = 2866; +static const TimeValue kMarsGantryDoorCloseIn = 1888; +static const TimeValue kMarsGantryDoorCloseOut = 2866; -const TimeValue kMarsTransportDoorCloseIn = 2866; -const TimeValue kMarsTransportDoorCloseOut = 3593; +static const TimeValue kMarsTransportDoorCloseIn = 2866; +static const TimeValue kMarsTransportDoorCloseOut = 3593; -const TimeValue kMarsAirlockPressurizeIn = 3593; -const TimeValue kMarsAirlockPressurizeOut = 4766; +static const TimeValue kMarsAirlockPressurizeIn = 3593; +static const TimeValue kMarsAirlockPressurizeOut = 4766; -const TimeValue kMarsBigAirlockDoorCloseIn = 4766; -const TimeValue kMarsBigAirlockDoorCloseOut = 7872; +static const TimeValue kMarsBigAirlockDoorCloseIn = 4766; +static const TimeValue kMarsBigAirlockDoorCloseOut = 7872; -const TimeValue kMarsSmallAirlockDoorCloseIn = 7872; -const TimeValue kMarsSmallAirlockDoorCloseOut = 10000; +static const TimeValue kMarsSmallAirlockDoorCloseIn = 7872; +static const TimeValue kMarsSmallAirlockDoorCloseOut = 10000; -const TimeValue kMarsMazeDoorCloseIn = 10000; -const TimeValue kMarsMazeDoorCloseOut = 10969; +static const TimeValue kMarsMazeDoorCloseIn = 10000; +static const TimeValue kMarsMazeDoorCloseOut = 10969; -const TimeValue kMarsRobotTakesTransportIn = 10969; -const TimeValue kMarsRobotTakesTransportOut = 12802; +static const TimeValue kMarsRobotTakesTransportIn = 10969; +static const TimeValue kMarsRobotTakesTransportOut = 12802; -const TimeValue kMarsPodDepartedUpperPlatformIn = 12802; -const TimeValue kMarsPodDepartedUpperPlatformOut = 15783; +static const TimeValue kMarsPodDepartedUpperPlatformIn = 12802; +static const TimeValue kMarsPodDepartedUpperPlatformOut = 15783; -const TimeValue kMarsPodDepartedLowerPlatformIn = 15783; -const TimeValue kMarsPodDepartedLowerPlatformOut = 18736; +static const TimeValue kMarsPodDepartedLowerPlatformIn = 15783; +static const TimeValue kMarsPodDepartedLowerPlatformOut = 18736; -const TimeValue kMarsPodArrivedUpperPlatformIn = 18736; -const TimeValue kMarsPodArrivedUpperPlatformOut = 21605; +static const TimeValue kMarsPodArrivedUpperPlatformIn = 18736; +static const TimeValue kMarsPodArrivedUpperPlatformOut = 21605; -const TimeValue kMarsCheckInRequiredIn = 21605; -const TimeValue kMarsCheckInRequiredOut = 27463; +static const TimeValue kMarsCheckInRequiredIn = 21605; +static const TimeValue kMarsCheckInRequiredOut = 27463; -const TimeValue kMarsCantOpenShuttleIn = 27463; -const TimeValue kMarsCantOpenShuttleOut = 29214; +static const TimeValue kMarsCantOpenShuttleIn = 27463; +static const TimeValue kMarsCantOpenShuttleOut = 29214; -const TimeValue kMarsShuttleLockOverrideIn = 29214; -const TimeValue kMarsShuttleLockOverrideOut = 30330; +static const TimeValue kMarsShuttleLockOverrideIn = 29214; +static const TimeValue kMarsShuttleLockOverrideOut = 30330; -const TimeValue kMarsNoShuttleIn = 30330; -const TimeValue kMarsNoShuttleOut = 31502; +static const TimeValue kMarsNoShuttleIn = 30330; +static const TimeValue kMarsNoShuttleOut = 31502; -const TimeValue kMustBeUnlockedIn = 31502; -const TimeValue kMustBeUnlockedOut = 33960; +static const TimeValue kMustBeUnlockedIn = 31502; +static const TimeValue kMustBeUnlockedOut = 33960; -const TimeValue kColorMatchBlueIn = 33960; -const TimeValue kColorMatchBlueOut = 34240; +static const TimeValue kColorMatchBlueIn = 33960; +static const TimeValue kColorMatchBlueOut = 34240; -const TimeValue kColorMatchRedIn = 34240; -const TimeValue kColorMatchRedOut = 34538; +static const TimeValue kColorMatchRedIn = 34240; +static const TimeValue kColorMatchRedOut = 34538; -const TimeValue kColorMatchGreenIn = 34538; -const TimeValue kColorMatchGreenOut = 34827; +static const TimeValue kColorMatchGreenIn = 34538; +static const TimeValue kColorMatchGreenOut = 34827; -const TimeValue kColorMatchYellowIn = 34827; -const TimeValue kColorMatchYellowOut = 35162; +static const TimeValue kColorMatchYellowIn = 34827; +static const TimeValue kColorMatchYellowOut = 35162; -const TimeValue kColorMatchPurpleIn = 35162; -const TimeValue kColorMatchPurpleOut = 35426; +static const TimeValue kColorMatchPurpleIn = 35162; +static const TimeValue kColorMatchPurpleOut = 35426; -const TimeValue kColorMatchZeroNodesIn = 35426; -const TimeValue kColorMatchZeroNodesOut = 36376; +static const TimeValue kColorMatchZeroNodesIn = 35426; +static const TimeValue kColorMatchZeroNodesOut = 36376; -const TimeValue kColorMatchOneNodeIn = 36376; -const TimeValue kColorMatchOneNodeOut = 37209; +static const TimeValue kColorMatchOneNodeIn = 36376; +static const TimeValue kColorMatchOneNodeOut = 37209; -const TimeValue kColorMatchTwoNodesIn = 37209; -const TimeValue kColorMatchTwoNodesOut = 37983; +static const TimeValue kColorMatchTwoNodesIn = 37209; +static const TimeValue kColorMatchTwoNodesOut = 37983; -const TimeValue kColorMatchThreeNodesIn = 37983; -const TimeValue kColorMatchThreeNodesOut = 38784; +static const TimeValue kColorMatchThreeNodesIn = 37983; +static const TimeValue kColorMatchThreeNodesOut = 38784; -const TimeValue kMarsShuttle1DepartedIn = 38784; -const TimeValue kMarsShuttle1DepartedOut = 40323; +static const TimeValue kMarsShuttle1DepartedIn = 38784; +static const TimeValue kMarsShuttle1DepartedOut = 40323; -const TimeValue kMarsShuttle2DepartedIn = 40323; -const TimeValue kMarsShuttle2DepartedOut = 41824; +static const TimeValue kMarsShuttle2DepartedIn = 40323; +static const TimeValue kMarsShuttle2DepartedOut = 41824; -const TimeValue kShuttleCockpitIn = 41824; -const TimeValue kShuttleCockpitOut = 43126; +static const TimeValue kShuttleCockpitIn = 41824; +static const TimeValue kShuttleCockpitOut = 43126; -const TimeValue kShuttleOnboardIn = 43126; -const TimeValue kShuttleOnboardOut = 44284; +static const TimeValue kShuttleOnboardIn = 43126; +static const TimeValue kShuttleOnboardOut = 44284; -const TimeValue kShuttleNavigationIn = 44284; -const TimeValue kShuttleNavigationOut = 46049; +static const TimeValue kShuttleNavigationIn = 44284; +static const TimeValue kShuttleNavigationOut = 46049; -const TimeValue kShuttleCommunicationIn = 46049; -const TimeValue kShuttleCommunicationOut = 47288; +static const TimeValue kShuttleCommunicationIn = 46049; +static const TimeValue kShuttleCommunicationOut = 47288; -const TimeValue kShuttleAutoTestingIn = 47288; -const TimeValue kShuttleAutoTestingOut = 48179; +static const TimeValue kShuttleAutoTestingIn = 47288; +static const TimeValue kShuttleAutoTestingOut = 48179; -const TimeValue kMarsThrusterAutoTestIn = 48179; -const TimeValue kMarsThrusterAutoTestOut = 49979; +static const TimeValue kMarsThrusterAutoTestIn = 48179; +static const TimeValue kMarsThrusterAutoTestOut = 49979; -const TimeValue kShuttleAllSystemsIn = 49979; -const TimeValue kShuttleAllSystemsOut = 51065; +static const TimeValue kShuttleAllSystemsIn = 49979; +static const TimeValue kShuttleAllSystemsOut = 51065; -const TimeValue kShuttleSecureLooseIn = 51065; -const TimeValue kShuttleSecureLooseOut = 52346; +static const TimeValue kShuttleSecureLooseIn = 51065; +static const TimeValue kShuttleSecureLooseOut = 52346; -const TimeValue kShuttlePrepareForDropIn = 52346; -const TimeValue kShuttlePrepareForDropOut = 53216; +static const TimeValue kShuttlePrepareForDropIn = 52346; +static const TimeValue kShuttlePrepareForDropOut = 53216; -const TimeValue kShuttleAllClearIn = 53216; -const TimeValue kShuttleAllClearOut = 54031; +static const TimeValue kShuttleAllClearIn = 53216; +static const TimeValue kShuttleAllClearOut = 54031; -const TimeValue kShuttleConfiguringIn = 54031; -const TimeValue kShuttleConfiguringOut = 54994; +static const TimeValue kShuttleConfiguringIn = 54031; +static const TimeValue kShuttleConfiguringOut = 54994; -const TimeValue kShuttleGeneratingIn = 54994; -const TimeValue kShuttleGeneratingOut = 56033; +static const TimeValue kShuttleGeneratingIn = 54994; +static const TimeValue kShuttleGeneratingOut = 56033; -const TimeValue kShuttleBreakawayIn = 56033; -const TimeValue kShuttleBreakawayOut = 57346; +static const TimeValue kShuttleBreakawayIn = 56033; +static const TimeValue kShuttleBreakawayOut = 57346; -const TimeValue kMarsAtmosphericBreakawayIn = 57346; -const TimeValue kMarsAtmosphericBreakawayOut = 59237; +static const TimeValue kMarsAtmosphericBreakawayIn = 57346; +static const TimeValue kMarsAtmosphericBreakawayOut = 59237; -const TimeValue kMarsCockpitChatterIn = 59237; -const TimeValue kMarsCockpitChatterOut = 70344; +static const TimeValue kMarsCockpitChatterIn = 59237; +static const TimeValue kMarsCockpitChatterOut = 70344; -const TimeValue kShuttleDamperDescIn = 70344; -const TimeValue kShuttleDamperDescOut = 73262; +static const TimeValue kShuttleDamperDescIn = 70344; +static const TimeValue kShuttleDamperDescOut = 73262; -const TimeValue kShuttleGravitonDescIn = 73262; -const TimeValue kShuttleGravitonDescOut = 75296; +static const TimeValue kShuttleGravitonDescIn = 73262; +static const TimeValue kShuttleGravitonDescOut = 75296; -const TimeValue kShuttleTractorDescIn = 75296; -const TimeValue kShuttleTractorDescOut = 78381; +static const TimeValue kShuttleTractorDescIn = 75296; +static const TimeValue kShuttleTractorDescOut = 78381; -const TimeValue kShuttleTargetSightedIn = 78381; -const TimeValue kShuttleTargetSightedOut = 79074; +static const TimeValue kShuttleTargetSightedIn = 78381; +static const TimeValue kShuttleTargetSightedOut = 79074; -const TimeValue kShuttleAutopilotEngagedIn = 79074; -const TimeValue kShuttleAutopilotEngagedOut = 80414; +static const TimeValue kShuttleAutopilotEngagedIn = 79074; +static const TimeValue kShuttleAutopilotEngagedOut = 80414; -const TimeValue kMarsEDBBlastIn = 80414; -const TimeValue kMarsEDBBlastOut = 80705; +static const TimeValue kMarsEDBBlastIn = 80414; +static const TimeValue kMarsEDBBlastOut = 80705; -const TimeValue kMarsGravitonBlastIn = 80705; -const TimeValue kMarsGravitonBlastOut = 81199; +static const TimeValue kMarsGravitonBlastIn = 80705; +static const TimeValue kMarsGravitonBlastOut = 81199; -const TimeValue kMarsJunkCollisionIn = 81199; -const TimeValue kMarsJunkCollisionOut = 81961; +static const TimeValue kMarsJunkCollisionIn = 81199; +static const TimeValue kMarsJunkCollisionOut = 81961; -const TimeValue kShuttleGravitonIn = 81961; -const TimeValue kShuttleGravitonOut = 82587; +static const TimeValue kShuttleGravitonIn = 81961; +static const TimeValue kShuttleGravitonOut = 82587; -const TimeValue kShuttleDampingBeamIn = 82587; -const TimeValue kShuttleDampingBeamOut = 83331; +static const TimeValue kShuttleDampingBeamIn = 82587; +static const TimeValue kShuttleDampingBeamOut = 83331; -const TimeValue kShuttleTractorBeamIn = 83331; -const TimeValue kShuttleTractorBeamOut = 83802; +static const TimeValue kShuttleTractorBeamIn = 83331; +static const TimeValue kShuttleTractorBeamOut = 83802; -const TimeValue kShuttleHullBreachIn = 83802; -const TimeValue kShuttleHullBreachOut = 84721; +static const TimeValue kShuttleHullBreachIn = 83802; +static const TimeValue kShuttleHullBreachOut = 84721; -const TimeValue kShuttleWingDamageIn = 84721; -const TimeValue kShuttleWingDamageOut = 85640; +static const TimeValue kShuttleWingDamageIn = 84721; +static const TimeValue kShuttleWingDamageOut = 85640; -const TimeValue kShuttleHullDamageIn = 85640; -const TimeValue kShuttleHullDamageOut = 86513; +static const TimeValue kShuttleHullDamageIn = 85640; +static const TimeValue kShuttleHullDamageOut = 86513; -const TimeValue kShuttleEnergyTooLowIn = 86513; -const TimeValue kShuttleEnergyTooLowOut = 87578; +static const TimeValue kShuttleEnergyTooLowIn = 86513; +static const TimeValue kShuttleEnergyTooLowOut = 87578; -const TimeValue kShuttleTractorLimitedIn = 87578; -const TimeValue kShuttleTractorLimitedOut = 89164; +static const TimeValue kShuttleTractorLimitedIn = 87578; +static const TimeValue kShuttleTractorLimitedOut = 89164; -const TimeValue kShuttleCantHoldIn = 89164; -const TimeValue kShuttleCantHoldOut = 90945; +static const TimeValue kShuttleCantHoldIn = 89164; +static const TimeValue kShuttleCantHoldOut = 90945; -const TimeValue kShuttleBrokeFreeIn = 90945; -const TimeValue kShuttleBrokeFreeOut = 92322; +static const TimeValue kShuttleBrokeFreeIn = 90945; +static const TimeValue kShuttleBrokeFreeOut = 92322; -const TimeValue kShuttleDestroyedIn = 92322; -const TimeValue kShuttleDestroyedOut = 93189; +static const TimeValue kShuttleDestroyedIn = 92322; +static const TimeValue kShuttleDestroyedOut = 93189; -const TimeValue kShuttleCoordinatesIn = 93189; -const TimeValue kShuttleCoordinatesOut = 94018; +static const TimeValue kShuttleCoordinatesIn = 93189; +static const TimeValue kShuttleCoordinatesOut = 94018; -const TimeValue kShuttleScanningIn = 94018; -const TimeValue kShuttleScanningOut = 94975; +static const TimeValue kShuttleScanningIn = 94018; +static const TimeValue kShuttleScanningOut = 94975; -const TimeValue kShuttleSafeIn = 94975; -const TimeValue kShuttleSafeOut = 96176; +static const TimeValue kShuttleSafeIn = 94975; +static const TimeValue kShuttleSafeOut = 96176; -const TimeValue kShuttleOverloadedIn = 96176; -const TimeValue kShuttleOverloadedOut = 101308; +static const TimeValue kShuttleOverloadedIn = 96176; +static const TimeValue kShuttleOverloadedOut = 101308; -const TimeScale kMarsMovieScale = 600; -const TimeScale kMarsFramesPerSecond = 15; -const TimeScale kMarsFrameDuration = 40; +static const TimeScale kMarsMovieScale = 600; +static const TimeScale kMarsFramesPerSecond = 15; +static const TimeScale kMarsFrameDuration = 40; // Alternate IDs. -const AlternateID kAltMarsNormal = 0; -const AlternateID kAltMarsPodAtMars34 = 1; -const AlternateID kAltMarsTookCard = 2; -const AlternateID kAltMars35AirlockEast = 3; -const AlternateID kAltMars35AirlockWest = 4; -const AlternateID kAltMarsPodAtMars45 = 5; -const AlternateID kAltMarsTookMask = 6; -const AlternateID kAltMarsMaskOnFiller = 7; -const AlternateID kAltMars60AirlockEast = 8; -const AlternateID kAltMars60AirlockWest = 9; +static const AlternateID kAltMarsNormal = 0; +static const AlternateID kAltMarsPodAtMars34 = 1; +static const AlternateID kAltMarsTookCard = 2; +static const AlternateID kAltMars35AirlockEast = 3; +static const AlternateID kAltMars35AirlockWest = 4; +static const AlternateID kAltMarsPodAtMars45 = 5; +static const AlternateID kAltMarsTookMask = 6; +static const AlternateID kAltMarsMaskOnFiller = 7; +static const AlternateID kAltMars60AirlockEast = 8; +static const AlternateID kAltMars60AirlockWest = 9; // Room IDs. -const RoomID kMars0A = 0; -const RoomID kMars00 = 1; -const RoomID kMars01 = 2; -const RoomID kMars02 = 3; -const RoomID kMars03 = 4; -const RoomID kMars04 = 5; -const RoomID kMars05 = 6; -const RoomID kMars06 = 7; -const RoomID kMars07 = 8; -const RoomID kMars08 = 9; -const RoomID kMars09 = 10; -const RoomID kMars10 = 11; -const RoomID kMars11 = 12; -const RoomID kMars12 = 13; -const RoomID kMars13 = 14; -const RoomID kMars14 = 15; -const RoomID kMars15 = 16; -const RoomID kMars16 = 17; -const RoomID kMars17 = 18; -const RoomID kMars18 = 19; -const RoomID kMars19 = 20; -const RoomID kMars20 = 21; -const RoomID kMars21 = 22; -const RoomID kMars22 = 23; -const RoomID kMars23 = 24; -const RoomID kMars24 = 25; -const RoomID kMars25 = 26; -const RoomID kMars26 = 27; -const RoomID kMars27 = 28; -const RoomID kMars28 = 29; -const RoomID kMars29 = 30; -const RoomID kMars30 = 31; -const RoomID kMars31 = 32; -const RoomID kMars31South = 33; -const RoomID kMars32 = 34; -const RoomID kMars33 = 35; -const RoomID kMars33North = 36; -const RoomID kMars34 = 37; -const RoomID kMars35 = 38; -const RoomID kMars36 = 39; -const RoomID kMars37 = 40; -const RoomID kMars38 = 41; -const RoomID kMars39 = 42; -const RoomID kMars41 = 43; -const RoomID kMars42 = 44; -const RoomID kMars43 = 45; -const RoomID kMars44 = 46; -const RoomID kMars45 = 47; -const RoomID kMars46 = 48; -const RoomID kMars47 = 49; -const RoomID kMars48 = 50; -const RoomID kMars49 = 51; -const RoomID kMars50 = 52; -const RoomID kMars51 = 53; -const RoomID kMars52 = 54; -const RoomID kMars54 = 55; -const RoomID kMars56 = 56; -const RoomID kMars58 = 57; -const RoomID kMars60 = 58; -const RoomID kMarsRobotShuttle = 59; -const RoomID kMarsMaze004 = 60; -const RoomID kMarsMaze005 = 61; -const RoomID kMarsMaze006 = 62; -const RoomID kMarsMaze007 = 63; -const RoomID kMarsMaze008 = 64; -const RoomID kMarsMaze009 = 65; -const RoomID kMarsMaze010 = 66; -const RoomID kMarsMaze011 = 67; -const RoomID kMarsMaze012 = 68; -const RoomID kMarsMaze015 = 69; -const RoomID kMarsMaze016 = 70; -const RoomID kMarsMaze017 = 71; -const RoomID kMarsMaze018 = 72; -const RoomID kMarsMaze019 = 73; -const RoomID kMarsMaze020 = 74; -const RoomID kMarsMaze021 = 75; -const RoomID kMarsMaze022 = 76; -const RoomID kMarsMaze023 = 77; -const RoomID kMarsMaze024 = 78; -const RoomID kMarsMaze025 = 79; -const RoomID kMarsMaze026 = 80; -const RoomID kMarsMaze027 = 81; -const RoomID kMarsMaze028 = 82; -const RoomID kMarsMaze031 = 83; -const RoomID kMarsMaze032 = 84; -const RoomID kMarsMaze033 = 85; -const RoomID kMarsMaze034 = 86; -const RoomID kMarsMaze035 = 87; -const RoomID kMarsMaze036 = 88; -const RoomID kMarsMaze037 = 89; -const RoomID kMarsMaze038 = 90; -const RoomID kMarsMaze039 = 91; -const RoomID kMarsMaze042 = 92; -const RoomID kMarsMaze043 = 93; -const RoomID kMarsMaze044 = 94; -const RoomID kMarsMaze045 = 95; -const RoomID kMarsMaze046 = 96; -const RoomID kMarsMaze047 = 97; -const RoomID kMarsMaze049 = 98; -const RoomID kMarsMaze050 = 99; -const RoomID kMarsMaze051 = 100; -const RoomID kMarsMaze052 = 101; -const RoomID kMarsMaze053 = 102; -const RoomID kMarsMaze054 = 103; -const RoomID kMarsMaze055 = 104; -const RoomID kMarsMaze056 = 105; -const RoomID kMarsMaze057 = 106; -const RoomID kMarsMaze058 = 107; -const RoomID kMarsMaze059 = 108; -const RoomID kMarsMaze060 = 109; -const RoomID kMarsMaze061 = 110; -const RoomID kMarsMaze063 = 111; -const RoomID kMarsMaze064 = 112; -const RoomID kMarsMaze065 = 113; -const RoomID kMarsMaze066 = 114; -const RoomID kMarsMaze067 = 115; -const RoomID kMarsMaze068 = 116; -const RoomID kMarsMaze069 = 117; -const RoomID kMarsMaze070 = 118; -const RoomID kMarsMaze071 = 119; -const RoomID kMarsMaze072 = 120; -const RoomID kMarsMaze074 = 121; -const RoomID kMarsMaze076 = 122; -const RoomID kMarsMaze078 = 123; -const RoomID kMarsMaze079 = 124; -const RoomID kMarsMaze081 = 125; -const RoomID kMarsMaze083 = 126; -const RoomID kMarsMaze084 = 127; -const RoomID kMarsMaze085 = 128; -const RoomID kMarsMaze086 = 129; -const RoomID kMarsMaze087 = 130; -const RoomID kMarsMaze088 = 131; -const RoomID kMarsMaze089 = 132; -const RoomID kMarsMaze090 = 133; -const RoomID kMarsMaze091 = 134; -const RoomID kMarsMaze092 = 135; -const RoomID kMarsMaze093 = 136; -const RoomID kMarsMaze098 = 137; -const RoomID kMarsMaze099 = 138; -const RoomID kMarsMaze100 = 139; -const RoomID kMarsMaze101 = 140; -const RoomID kMarsMaze104 = 141; -const RoomID kMarsMaze105 = 142; -const RoomID kMarsMaze106 = 143; -const RoomID kMarsMaze107 = 144; -const RoomID kMarsMaze108 = 145; -const RoomID kMarsMaze111 = 146; -const RoomID kMarsMaze113 = 147; -const RoomID kMarsMaze114 = 148; -const RoomID kMarsMaze115 = 149; -const RoomID kMarsMaze116 = 150; -const RoomID kMarsMaze117 = 151; -const RoomID kMarsMaze118 = 152; -const RoomID kMarsMaze119 = 153; -const RoomID kMarsMaze120 = 154; -const RoomID kMarsMaze121 = 155; -const RoomID kMarsMaze122 = 156; -const RoomID kMarsMaze123 = 157; -const RoomID kMarsMaze124 = 158; -const RoomID kMarsMaze125 = 159; -const RoomID kMarsMaze126 = 160; -const RoomID kMarsMaze127 = 161; -const RoomID kMarsMaze128 = 162; -const RoomID kMarsMaze129 = 163; -const RoomID kMarsMaze130 = 164; -const RoomID kMarsMaze131 = 165; -const RoomID kMarsMaze132 = 166; -const RoomID kMarsMaze133 = 167; -const RoomID kMarsMaze136 = 168; -const RoomID kMarsMaze137 = 169; -const RoomID kMarsMaze138 = 170; -const RoomID kMarsMaze139 = 171; -const RoomID kMarsMaze140 = 172; -const RoomID kMarsMaze141 = 173; -const RoomID kMarsMaze142 = 174; -const RoomID kMarsMaze143 = 175; -const RoomID kMarsMaze144 = 176; -const RoomID kMarsMaze145 = 177; -const RoomID kMarsMaze146 = 178; -const RoomID kMarsMaze147 = 179; -const RoomID kMarsMaze148 = 180; -const RoomID kMarsMaze149 = 181; -const RoomID kMarsMaze152 = 182; -const RoomID kMarsMaze153 = 183; -const RoomID kMarsMaze154 = 184; -const RoomID kMarsMaze155 = 185; -const RoomID kMarsMaze156 = 186; -const RoomID kMarsMaze157 = 187; -const RoomID kMarsMaze159 = 188; -const RoomID kMarsMaze160 = 189; -const RoomID kMarsMaze161 = 190; -const RoomID kMarsMaze162 = 191; -const RoomID kMarsMaze163 = 192; -const RoomID kMarsMaze164 = 193; -const RoomID kMarsMaze165 = 194; -const RoomID kMarsMaze166 = 195; -const RoomID kMarsMaze167 = 196; -const RoomID kMarsMaze168 = 197; -const RoomID kMarsMaze169 = 198; -const RoomID kMarsMaze170 = 199; -const RoomID kMarsMaze171 = 200; -const RoomID kMarsMaze172 = 201; -const RoomID kMarsMaze173 = 202; -const RoomID kMarsMaze174 = 203; -const RoomID kMarsMaze175 = 204; -const RoomID kMarsMaze177 = 205; -const RoomID kMarsMaze178 = 206; -const RoomID kMarsMaze179 = 207; -const RoomID kMarsMaze180 = 208; -const RoomID kMarsMaze181 = 209; -const RoomID kMarsMaze182 = 210; -const RoomID kMarsMaze183 = 211; -const RoomID kMarsMaze184 = 212; -const RoomID kMarsMaze187 = 213; -const RoomID kMarsMaze188 = 214; -const RoomID kMarsMaze189 = 215; -const RoomID kMarsMaze190 = 216; -const RoomID kMarsMaze191 = 217; -const RoomID kMarsMaze192 = 218; -const RoomID kMarsMaze193 = 219; -const RoomID kMarsMaze194 = 220; -const RoomID kMarsMaze195 = 221; -const RoomID kMarsMaze198 = 222; -const RoomID kMarsMaze199 = 223; -const RoomID kMarsMaze200 = 224; -const RoomID kMarsDeathRoom = 225; +static const RoomID kMars0A = 0; +static const RoomID kMars00 = 1; +static const RoomID kMars01 = 2; +static const RoomID kMars02 = 3; +static const RoomID kMars03 = 4; +static const RoomID kMars04 = 5; +static const RoomID kMars05 = 6; +static const RoomID kMars06 = 7; +static const RoomID kMars07 = 8; +static const RoomID kMars08 = 9; +static const RoomID kMars09 = 10; +static const RoomID kMars10 = 11; +static const RoomID kMars11 = 12; +static const RoomID kMars12 = 13; +static const RoomID kMars13 = 14; +static const RoomID kMars14 = 15; +static const RoomID kMars15 = 16; +static const RoomID kMars16 = 17; +static const RoomID kMars17 = 18; +static const RoomID kMars18 = 19; +static const RoomID kMars19 = 20; +static const RoomID kMars20 = 21; +static const RoomID kMars21 = 22; +static const RoomID kMars22 = 23; +static const RoomID kMars23 = 24; +static const RoomID kMars24 = 25; +static const RoomID kMars25 = 26; +static const RoomID kMars26 = 27; +static const RoomID kMars27 = 28; +static const RoomID kMars28 = 29; +static const RoomID kMars29 = 30; +static const RoomID kMars30 = 31; +static const RoomID kMars31 = 32; +static const RoomID kMars31South = 33; +static const RoomID kMars32 = 34; +static const RoomID kMars33 = 35; +static const RoomID kMars33North = 36; +static const RoomID kMars34 = 37; +static const RoomID kMars35 = 38; +static const RoomID kMars36 = 39; +static const RoomID kMars37 = 40; +static const RoomID kMars38 = 41; +static const RoomID kMars39 = 42; +static const RoomID kMars41 = 43; +static const RoomID kMars42 = 44; +static const RoomID kMars43 = 45; +static const RoomID kMars44 = 46; +static const RoomID kMars45 = 47; +static const RoomID kMars46 = 48; +static const RoomID kMars47 = 49; +static const RoomID kMars48 = 50; +static const RoomID kMars49 = 51; +static const RoomID kMars50 = 52; +static const RoomID kMars51 = 53; +static const RoomID kMars52 = 54; +static const RoomID kMars54 = 55; +static const RoomID kMars56 = 56; +static const RoomID kMars58 = 57; +static const RoomID kMars60 = 58; +static const RoomID kMarsRobotShuttle = 59; +static const RoomID kMarsMaze004 = 60; +static const RoomID kMarsMaze005 = 61; +static const RoomID kMarsMaze006 = 62; +static const RoomID kMarsMaze007 = 63; +static const RoomID kMarsMaze008 = 64; +static const RoomID kMarsMaze009 = 65; +static const RoomID kMarsMaze010 = 66; +static const RoomID kMarsMaze011 = 67; +static const RoomID kMarsMaze012 = 68; +static const RoomID kMarsMaze015 = 69; +static const RoomID kMarsMaze016 = 70; +static const RoomID kMarsMaze017 = 71; +static const RoomID kMarsMaze018 = 72; +static const RoomID kMarsMaze019 = 73; +static const RoomID kMarsMaze020 = 74; +static const RoomID kMarsMaze021 = 75; +static const RoomID kMarsMaze022 = 76; +static const RoomID kMarsMaze023 = 77; +static const RoomID kMarsMaze024 = 78; +static const RoomID kMarsMaze025 = 79; +static const RoomID kMarsMaze026 = 80; +static const RoomID kMarsMaze027 = 81; +static const RoomID kMarsMaze028 = 82; +static const RoomID kMarsMaze031 = 83; +static const RoomID kMarsMaze032 = 84; +static const RoomID kMarsMaze033 = 85; +static const RoomID kMarsMaze034 = 86; +static const RoomID kMarsMaze035 = 87; +static const RoomID kMarsMaze036 = 88; +static const RoomID kMarsMaze037 = 89; +static const RoomID kMarsMaze038 = 90; +static const RoomID kMarsMaze039 = 91; +static const RoomID kMarsMaze042 = 92; +static const RoomID kMarsMaze043 = 93; +static const RoomID kMarsMaze044 = 94; +static const RoomID kMarsMaze045 = 95; +static const RoomID kMarsMaze046 = 96; +static const RoomID kMarsMaze047 = 97; +static const RoomID kMarsMaze049 = 98; +static const RoomID kMarsMaze050 = 99; +static const RoomID kMarsMaze051 = 100; +static const RoomID kMarsMaze052 = 101; +static const RoomID kMarsMaze053 = 102; +static const RoomID kMarsMaze054 = 103; +static const RoomID kMarsMaze055 = 104; +static const RoomID kMarsMaze056 = 105; +static const RoomID kMarsMaze057 = 106; +static const RoomID kMarsMaze058 = 107; +static const RoomID kMarsMaze059 = 108; +static const RoomID kMarsMaze060 = 109; +static const RoomID kMarsMaze061 = 110; +static const RoomID kMarsMaze063 = 111; +static const RoomID kMarsMaze064 = 112; +static const RoomID kMarsMaze065 = 113; +static const RoomID kMarsMaze066 = 114; +static const RoomID kMarsMaze067 = 115; +static const RoomID kMarsMaze068 = 116; +static const RoomID kMarsMaze069 = 117; +static const RoomID kMarsMaze070 = 118; +static const RoomID kMarsMaze071 = 119; +static const RoomID kMarsMaze072 = 120; +static const RoomID kMarsMaze074 = 121; +static const RoomID kMarsMaze076 = 122; +static const RoomID kMarsMaze078 = 123; +static const RoomID kMarsMaze079 = 124; +static const RoomID kMarsMaze081 = 125; +static const RoomID kMarsMaze083 = 126; +static const RoomID kMarsMaze084 = 127; +static const RoomID kMarsMaze085 = 128; +static const RoomID kMarsMaze086 = 129; +static const RoomID kMarsMaze087 = 130; +static const RoomID kMarsMaze088 = 131; +static const RoomID kMarsMaze089 = 132; +static const RoomID kMarsMaze090 = 133; +static const RoomID kMarsMaze091 = 134; +static const RoomID kMarsMaze092 = 135; +static const RoomID kMarsMaze093 = 136; +static const RoomID kMarsMaze098 = 137; +static const RoomID kMarsMaze099 = 138; +static const RoomID kMarsMaze100 = 139; +static const RoomID kMarsMaze101 = 140; +static const RoomID kMarsMaze104 = 141; +static const RoomID kMarsMaze105 = 142; +static const RoomID kMarsMaze106 = 143; +static const RoomID kMarsMaze107 = 144; +static const RoomID kMarsMaze108 = 145; +static const RoomID kMarsMaze111 = 146; +static const RoomID kMarsMaze113 = 147; +static const RoomID kMarsMaze114 = 148; +static const RoomID kMarsMaze115 = 149; +static const RoomID kMarsMaze116 = 150; +static const RoomID kMarsMaze117 = 151; +static const RoomID kMarsMaze118 = 152; +static const RoomID kMarsMaze119 = 153; +static const RoomID kMarsMaze120 = 154; +static const RoomID kMarsMaze121 = 155; +static const RoomID kMarsMaze122 = 156; +static const RoomID kMarsMaze123 = 157; +static const RoomID kMarsMaze124 = 158; +static const RoomID kMarsMaze125 = 159; +static const RoomID kMarsMaze126 = 160; +static const RoomID kMarsMaze127 = 161; +static const RoomID kMarsMaze128 = 162; +static const RoomID kMarsMaze129 = 163; +static const RoomID kMarsMaze130 = 164; +static const RoomID kMarsMaze131 = 165; +static const RoomID kMarsMaze132 = 166; +static const RoomID kMarsMaze133 = 167; +static const RoomID kMarsMaze136 = 168; +static const RoomID kMarsMaze137 = 169; +static const RoomID kMarsMaze138 = 170; +static const RoomID kMarsMaze139 = 171; +static const RoomID kMarsMaze140 = 172; +static const RoomID kMarsMaze141 = 173; +static const RoomID kMarsMaze142 = 174; +static const RoomID kMarsMaze143 = 175; +static const RoomID kMarsMaze144 = 176; +static const RoomID kMarsMaze145 = 177; +static const RoomID kMarsMaze146 = 178; +static const RoomID kMarsMaze147 = 179; +static const RoomID kMarsMaze148 = 180; +static const RoomID kMarsMaze149 = 181; +static const RoomID kMarsMaze152 = 182; +static const RoomID kMarsMaze153 = 183; +static const RoomID kMarsMaze154 = 184; +static const RoomID kMarsMaze155 = 185; +static const RoomID kMarsMaze156 = 186; +static const RoomID kMarsMaze157 = 187; +static const RoomID kMarsMaze159 = 188; +static const RoomID kMarsMaze160 = 189; +static const RoomID kMarsMaze161 = 190; +static const RoomID kMarsMaze162 = 191; +static const RoomID kMarsMaze163 = 192; +static const RoomID kMarsMaze164 = 193; +static const RoomID kMarsMaze165 = 194; +static const RoomID kMarsMaze166 = 195; +static const RoomID kMarsMaze167 = 196; +static const RoomID kMarsMaze168 = 197; +static const RoomID kMarsMaze169 = 198; +static const RoomID kMarsMaze170 = 199; +static const RoomID kMarsMaze171 = 200; +static const RoomID kMarsMaze172 = 201; +static const RoomID kMarsMaze173 = 202; +static const RoomID kMarsMaze174 = 203; +static const RoomID kMarsMaze175 = 204; +static const RoomID kMarsMaze177 = 205; +static const RoomID kMarsMaze178 = 206; +static const RoomID kMarsMaze179 = 207; +static const RoomID kMarsMaze180 = 208; +static const RoomID kMarsMaze181 = 209; +static const RoomID kMarsMaze182 = 210; +static const RoomID kMarsMaze183 = 211; +static const RoomID kMarsMaze184 = 212; +static const RoomID kMarsMaze187 = 213; +static const RoomID kMarsMaze188 = 214; +static const RoomID kMarsMaze189 = 215; +static const RoomID kMarsMaze190 = 216; +static const RoomID kMarsMaze191 = 217; +static const RoomID kMarsMaze192 = 218; +static const RoomID kMarsMaze193 = 219; +static const RoomID kMarsMaze194 = 220; +static const RoomID kMarsMaze195 = 221; +static const RoomID kMarsMaze198 = 222; +static const RoomID kMarsMaze199 = 223; +static const RoomID kMarsMaze200 = 224; +static const RoomID kMarsDeathRoom = 225; // Hot Spot Activation IDs. -const HotSpotActivationID kActivationReadyForKiosk = 1; -const HotSpotActivationID kActivationKioskChoice = 2; -const HotSpotActivationID kActivationTunnelMapReady = 3; -const HotSpotActivationID kActivateMarsPodClosed = 4; -const HotSpotActivationID kActivateMarsPodOpen = 5; -const HotSpotActivationID kActivateReadyToPressurizeAirlock = 6; -const HotSpotActivationID kActivateAirlockPressurized = 7; -const HotSpotActivationID kActivateMaskOnHolder = 8; -const HotSpotActivationID kActivateMaskOnFiller = 9; -const HotSpotActivationID kActivateReactorPlatformOut = 10; -const HotSpotActivationID kActivateReactorPlatformIn = 11; -const HotSpotActivationID kActivateReactorAskLowerScreen = 12; -const HotSpotActivationID kActivateReactorReadyForNitrogen = 13; -const HotSpotActivationID kActivateReactorReadyForCrowBar = 14; -const HotSpotActivationID kActivateReactorAskOperation = 15; -const HotSpotActivationID kActivateReactorRanEvaluation = 16; -const HotSpotActivationID kActivateReactorRanDiagnostics = 17; -const HotSpotActivationID kActivateReactorAnalyzed = 18; -const HotSpotActivationID kActivateReactorInstructions = 19; -const HotSpotActivationID kActivateReactorInGame = 20; -const HotSpotActivationID kActivateReactorBombSafe = 21; -const HotSpotActivationID kActivateReactorBombExposed = 22; -const HotSpotActivationID kActivationRobotHeadClosed = 23; -const HotSpotActivationID kActivationRobotHeadOpen = 24; +static const HotSpotActivationID kActivationReadyForKiosk = 1; +static const HotSpotActivationID kActivationKioskChoice = 2; +static const HotSpotActivationID kActivationTunnelMapReady = 3; +static const HotSpotActivationID kActivateMarsPodClosed = 4; +static const HotSpotActivationID kActivateMarsPodOpen = 5; +static const HotSpotActivationID kActivateReadyToPressurizeAirlock = 6; +static const HotSpotActivationID kActivateAirlockPressurized = 7; +static const HotSpotActivationID kActivateMaskOnHolder = 8; +static const HotSpotActivationID kActivateMaskOnFiller = 9; +static const HotSpotActivationID kActivateReactorPlatformOut = 10; +static const HotSpotActivationID kActivateReactorPlatformIn = 11; +static const HotSpotActivationID kActivateReactorAskLowerScreen = 12; +static const HotSpotActivationID kActivateReactorReadyForNitrogen = 13; +static const HotSpotActivationID kActivateReactorReadyForCrowBar = 14; +static const HotSpotActivationID kActivateReactorAskOperation = 15; +static const HotSpotActivationID kActivateReactorRanEvaluation = 16; +static const HotSpotActivationID kActivateReactorRanDiagnostics = 17; +static const HotSpotActivationID kActivateReactorAnalyzed = 18; +static const HotSpotActivationID kActivateReactorInstructions = 19; +static const HotSpotActivationID kActivateReactorInGame = 20; +static const HotSpotActivationID kActivateReactorBombSafe = 21; +static const HotSpotActivationID kActivateReactorBombExposed = 22; +static const HotSpotActivationID kActivationRobotHeadClosed = 23; +static const HotSpotActivationID kActivationRobotHeadOpen = 24; // Hot Spot IDs. -const HotSpotID kMars11NorthKioskSpotID = 5000; -const HotSpotID kMars11NorthKioskSightsSpotID = 5001; -const HotSpotID kMars11NorthKioskColonySpotID = 5002; -const HotSpotID kMars12NorthKioskSpotID = 5003; -const HotSpotID kMars12NorthKioskSightsSpotID = 5004; -const HotSpotID kMars12NorthKioskColonySpotID = 5005; -const HotSpotID kMars31SouthSpotID = 5006; -const HotSpotID kMars31SouthOutSpotID = 5007; -const HotSpotID kMars31SouthCardSpotID = 5008; -const HotSpotID kMars33NorthSpotID = 5009; -const HotSpotID kMars33NorthOutSpotID = 5010; -const HotSpotID kMars33NorthMonitorSpotID = 5011; -const HotSpotID kMars34NorthCardDropSpotID = 5012; -const HotSpotID kMars34SouthOpenStorageSpotID = 5013; -const HotSpotID kMars34SouthCloseStorageSpotID = 5014; -const HotSpotID kMars34SouthCrowbarSpotID = 5015; -const HotSpotID kMars35EastPressurizeSpotID = 5016; -const HotSpotID kMars35EastSpinSpotID = 5017; -const HotSpotID kMars35WestPressurizeSpotID = 5018; -const HotSpotID kMars35WestSpinSpotID = 5019; -const HotSpotID kMars45NorthOpenStorageSpotID = 5020; -const HotSpotID kMars45NorthCloseStorageSpotID = 5021; -const HotSpotID kMars45NorthCrowbarSpotID = 5022; -const HotSpotID kAttackRobotHotSpotID = 5023; -const HotSpotID kMars49AirMaskSpotID = 5024; -const HotSpotID kMars49AirMaskFilledSpotID = 5025; -const HotSpotID kMars49AirFillingDropSpotID = 5026; -const HotSpotID kMars52MoveLeftSpotID = 5027; -const HotSpotID kMars52MoveRightSpotID = 5028; -const HotSpotID kMars52ExtractSpotID = 5029; -const HotSpotID kMars53RetractSpotID = 5030; -const HotSpotID kMars54MoveLeftSpotID = 5031; -const HotSpotID kMars54MoveRightSpotID = 5032; -const HotSpotID kMars54ExtractSpotID = 5033; -const HotSpotID kMars55RetractSpotID = 5034; -const HotSpotID kMars56MoveLeftSpotID = 5035; -const HotSpotID kMars56MoveRightSpotID = 5036; -const HotSpotID kMars56ExtractSpotID = 5037; -const HotSpotID kMars57RetractSpotID = 5038; -const HotSpotID kMars57LowerScreenSpotID = 5039; -const HotSpotID kMars57Retract2SpotID = 5040; -const HotSpotID kMars57DropNitrogenSpotID = 5041; -const HotSpotID kMars57DropCrowBarSpotID = 5042; -const HotSpotID kMars57CantOpenPanelSpotID = 5043; -const HotSpotID kMars57ShieldEvaluationSpotID = 5044; -const HotSpotID kMars57MeasureOutputSpotID = 5045; -const HotSpotID kMars57RunDiagnosticsSpotID = 5046; -const HotSpotID kMars57BackToOperationMenuSpotID = 5047; -const HotSpotID kMars57AnalyzeObjectSpotID = 5048; -const HotSpotID kMars57RemoveObjectMenuSpotID = 5049; -const HotSpotID kMars57CircuitLinkSpotID = 5050; -const HotSpotID kMars57CancelCircuitLinkSpotID = 5051; -const HotSpotID kMars57GameInstructionsSpotID = 5052; -const HotSpotID kMars57UndoMoveSpotID = 5053; -const HotSpotID kMars57RedMoveSpotID = 5054; -const HotSpotID kMars57YellowMoveSpotID = 5055; -const HotSpotID kMars57GreenMoveSpotID = 5056; -const HotSpotID kMars57BlueMoveSpotID = 5057; -const HotSpotID kMars57PurpleMoveSpotID = 5058; -const HotSpotID kMars57LowerScreenSafelySpotID = 5059; -const HotSpotID kMars57GrabBombSpotID = 5060; -const HotSpotID kMars58MoveLeftSpotID = 5061; -const HotSpotID kMars58MoveRightSpotID = 5062; -const HotSpotID kMars58ExtractSpotID = 5063; -const HotSpotID kMars59RetractSpotID = 5064; -const HotSpotID kMars60EastPressurizeSpotID = 5065; -const HotSpotID kMars60EastSpinSpotID = 5066; -const HotSpotID kMars60WestPressurizeSpotID = 5067; -const HotSpotID kMars60WestSpinSpotID = 5068; -const HotSpotID kRobotShuttleOpenHeadSpotID = 5069; -const HotSpotID kRobotShuttleMapChipSpotID = 5070; -const HotSpotID kRobotShuttleOpticalChipSpotID = 5071; -const HotSpotID kRobotShuttleShieldChipSpotID = 5072; +static const HotSpotID kMars11NorthKioskSpotID = 5000; +static const HotSpotID kMars11NorthKioskSightsSpotID = 5001; +static const HotSpotID kMars11NorthKioskColonySpotID = 5002; +static const HotSpotID kMars12NorthKioskSpotID = 5003; +static const HotSpotID kMars12NorthKioskSightsSpotID = 5004; +static const HotSpotID kMars12NorthKioskColonySpotID = 5005; +static const HotSpotID kMars31SouthSpotID = 5006; +static const HotSpotID kMars31SouthOutSpotID = 5007; +static const HotSpotID kMars31SouthCardSpotID = 5008; +static const HotSpotID kMars33NorthSpotID = 5009; +static const HotSpotID kMars33NorthOutSpotID = 5010; +static const HotSpotID kMars33NorthMonitorSpotID = 5011; +static const HotSpotID kMars34NorthCardDropSpotID = 5012; +static const HotSpotID kMars34SouthOpenStorageSpotID = 5013; +static const HotSpotID kMars34SouthCloseStorageSpotID = 5014; +static const HotSpotID kMars34SouthCrowbarSpotID = 5015; +static const HotSpotID kMars35EastPressurizeSpotID = 5016; +static const HotSpotID kMars35EastSpinSpotID = 5017; +static const HotSpotID kMars35WestPressurizeSpotID = 5018; +static const HotSpotID kMars35WestSpinSpotID = 5019; +static const HotSpotID kMars45NorthOpenStorageSpotID = 5020; +static const HotSpotID kMars45NorthCloseStorageSpotID = 5021; +static const HotSpotID kMars45NorthCrowbarSpotID = 5022; +static const HotSpotID kAttackRobotHotSpotID = 5023; +static const HotSpotID kMars49AirMaskSpotID = 5024; +static const HotSpotID kMars49AirMaskFilledSpotID = 5025; +static const HotSpotID kMars49AirFillingDropSpotID = 5026; +static const HotSpotID kMars52MoveLeftSpotID = 5027; +static const HotSpotID kMars52MoveRightSpotID = 5028; +static const HotSpotID kMars52ExtractSpotID = 5029; +static const HotSpotID kMars53RetractSpotID = 5030; +static const HotSpotID kMars54MoveLeftSpotID = 5031; +static const HotSpotID kMars54MoveRightSpotID = 5032; +static const HotSpotID kMars54ExtractSpotID = 5033; +static const HotSpotID kMars55RetractSpotID = 5034; +static const HotSpotID kMars56MoveLeftSpotID = 5035; +static const HotSpotID kMars56MoveRightSpotID = 5036; +static const HotSpotID kMars56ExtractSpotID = 5037; +static const HotSpotID kMars57RetractSpotID = 5038; +static const HotSpotID kMars57LowerScreenSpotID = 5039; +static const HotSpotID kMars57Retract2SpotID = 5040; +static const HotSpotID kMars57DropNitrogenSpotID = 5041; +static const HotSpotID kMars57DropCrowBarSpotID = 5042; +static const HotSpotID kMars57CantOpenPanelSpotID = 5043; +static const HotSpotID kMars57ShieldEvaluationSpotID = 5044; +static const HotSpotID kMars57MeasureOutputSpotID = 5045; +static const HotSpotID kMars57RunDiagnosticsSpotID = 5046; +static const HotSpotID kMars57BackToOperationMenuSpotID = 5047; +static const HotSpotID kMars57AnalyzeObjectSpotID = 5048; +static const HotSpotID kMars57RemoveObjectMenuSpotID = 5049; +static const HotSpotID kMars57CircuitLinkSpotID = 5050; +static const HotSpotID kMars57CancelCircuitLinkSpotID = 5051; +static const HotSpotID kMars57GameInstructionsSpotID = 5052; +static const HotSpotID kMars57UndoMoveSpotID = 5053; +static const HotSpotID kMars57RedMoveSpotID = 5054; +static const HotSpotID kMars57YellowMoveSpotID = 5055; +static const HotSpotID kMars57GreenMoveSpotID = 5056; +static const HotSpotID kMars57BlueMoveSpotID = 5057; +static const HotSpotID kMars57PurpleMoveSpotID = 5058; +static const HotSpotID kMars57LowerScreenSafelySpotID = 5059; +static const HotSpotID kMars57GrabBombSpotID = 5060; +static const HotSpotID kMars58MoveLeftSpotID = 5061; +static const HotSpotID kMars58MoveRightSpotID = 5062; +static const HotSpotID kMars58ExtractSpotID = 5063; +static const HotSpotID kMars59RetractSpotID = 5064; +static const HotSpotID kMars60EastPressurizeSpotID = 5065; +static const HotSpotID kMars60EastSpinSpotID = 5066; +static const HotSpotID kMars60WestPressurizeSpotID = 5067; +static const HotSpotID kMars60WestSpinSpotID = 5068; +static const HotSpotID kRobotShuttleOpenHeadSpotID = 5069; +static const HotSpotID kRobotShuttleMapChipSpotID = 5070; +static const HotSpotID kRobotShuttleOpticalChipSpotID = 5071; +static const HotSpotID kRobotShuttleShieldChipSpotID = 5072; // Extra sequence IDs. -const ExtraID kMarsArrivalFromTSA = 0; -const ExtraID kMars0AWatchShuttleDepart = 1; -const ExtraID kRobotThrowsPlayer = 2; -const ExtraID kMarsInfoKioskIntro = 3; -const ExtraID kMarsColonyInfo = 4; -const ExtraID kMarsSightsInfo = 5; -const ExtraID kRobotOnWayToShuttle = 6; -const ExtraID kMars31SouthZoomInNoCard = 7; -const ExtraID kMars31SouthViewNoCard = 8; -const ExtraID kMars31SouthZoomOutNoCard = 9; -const ExtraID kMars31SouthZoomViewNoCard = 10; -const ExtraID kMars33SlideShow1 = 11; -const ExtraID kMars33SlideShow2 = 12; -const ExtraID kMars33SlideShow3 = 13; -const ExtraID kMars33SlideShow4 = 14; -const ExtraID kMars34SpotOpenWithBar = 15; -const ExtraID kMars34SpotCloseWithBar = 16; -const ExtraID kMars34SpotOpenNoBar = 17; -const ExtraID kMars34SpotCloseNoBar = 18; -const ExtraID kMars34ViewOpenWithBar = 19; -const ExtraID kMars34ViewOpenNoBar = 20; -const ExtraID kMars34NorthPodGreeting = 21; -const ExtraID kMarsTurnOnPod = 22; -const ExtraID kMarsTakePodToMars45 = 23; -const ExtraID kMars35WestSpinAirlockToEast = 24; -const ExtraID kMars35EastSpinAirlockToWest = 25; -const ExtraID kMars45SpotOpenWithBar = 26; -const ExtraID kMars45SpotCloseWithBar = 27; -const ExtraID kMars45SpotOpenNoBar = 28; -const ExtraID kMars45SpotCloseNoBar = 29; -const ExtraID kMars45ViewOpenWithBar = 30; -const ExtraID kMars45ViewOpenNoBar = 31; -const ExtraID kMars48RobotApproaches = 32; -const ExtraID kMars48RobotKillsPlayer = 33; -const ExtraID kMars48RobotLoops = 34; -const ExtraID kMars48RobotView = 35; -const ExtraID kMars48RobotDefends = 36; -const ExtraID kMars49SouthViewMaskFilling = 37; -const ExtraID kMars52SpinLeft = 38; -const ExtraID kMars52SpinRight = 39; -const ExtraID kMars52Extend = 40; -const ExtraID kMars53Retract = 41; -const ExtraID kMars54SpinLeft = 42; -const ExtraID kMars54SpinRight = 43; -const ExtraID kMars54Extend = 44; -const ExtraID kMars55Retract = 45; -const ExtraID kMars56SpinLeft = 46; -const ExtraID kMars56SpinRight = 47; -const ExtraID kMars56ExtendWithBomb = 48; -const ExtraID kMars56ExtendNoBomb = 49; -const ExtraID kMars57RetractWithBomb = 50; -const ExtraID kMars57RetractNoBomb = 51; -const ExtraID kMars57LowerScreenClosed = 52; -const ExtraID kMars57CantOpenPanel = 53; -const ExtraID kMars57FreezeLock = 54; -const ExtraID kMars57BreakLock = 55; -const ExtraID kMars57LockFrozenView = 56; -const ExtraID kMars57ThawLock = 57; -const ExtraID kMars57OpenPanel = 58; -const ExtraID kMars57OpenPanelChoices = 59; -const ExtraID kMars57ShieldEvaluation = 60; -const ExtraID kMars57MeasureOutput = 61; -const ExtraID kMars57ShieldOkayLoop = 62; -const ExtraID kMars57RunDiagnostics = 63; -const ExtraID kMars57BombExplodes = 64; -const ExtraID kMars57BombAnalysis = 65; -const ExtraID kMars57DontLink = 66; -const ExtraID kMars57CircuitLink = 67; -const ExtraID kMars57GameLevel1 = 68; -const ExtraID kMars57GameLevel2 = 69; -const ExtraID kMars57GameLevel3 = 70; -const ExtraID kMars57BombExplodesInGame = 71; -const ExtraID kMars57GameSolved = 72; -const ExtraID kMars57ExposeBomb = 73; -const ExtraID kMars57BackToNormal = 74; -const ExtraID kMars57ViewOpenNoBomb = 75; -const ExtraID kMars58SpinLeft = 76; -const ExtraID kMars58SpinRight = 77; -const ExtraID kMars58Extend = 78; -const ExtraID kMars59Retract = 79; -const ExtraID kMars60WestSpinAirlockToEast = 80; -const ExtraID kMars60EastSpinAirlockToWest = 81; -const ExtraID kMarsRobotHeadOpen = 82; -const ExtraID kMarsRobotHeadClose = 83; -const ExtraID kMarsRobotHead000 = 84; -const ExtraID kMarsRobotHead001 = 85; -const ExtraID kMarsRobotHead010 = 86; -const ExtraID kMarsRobotHead011 = 87; -const ExtraID kMarsRobotHead100 = 88; -const ExtraID kMarsRobotHead101 = 89; -const ExtraID kMarsRobotHead110 = 90; -const ExtraID kMarsRobotHead111 = 91; -const ExtraID kMarsMaze007RobotApproach = 92; -const ExtraID kMarsMaze007RobotLoop = 93; -const ExtraID kMarsMaze007RobotDeath = 94; -const ExtraID kMarsMaze015SouthRobotApproach = 95; -const ExtraID kMarsMaze015SouthRobotLoop = 96; -const ExtraID kMarsMaze015SouthRobotDeath = 97; -const ExtraID kMarsMaze101EastRobotApproach = 98; -const ExtraID kMarsMaze101EastRobotLoop = 99; -const ExtraID kMarsMaze101EastRobotDeath = 100; -const ExtraID kMarsMaze104WestLoop = 101; -const ExtraID kMarsMaze104WestDeath = 102; -const ExtraID kMarsMaze133SouthApproach = 103; -const ExtraID kMarsMaze133SouthLoop = 104; -const ExtraID kMarsMaze133SouthDeath = 105; -const ExtraID kMarsMaze136NorthApproach = 106; -const ExtraID kMarsMaze136NorthLoop = 107; -const ExtraID kMarsMaze136NorthDeath = 108; -const ExtraID kMarsMaze184WestLoop = 109; -const ExtraID kMarsMaze184WestDeath = 110; -const ExtraID kMars200DeathInBucket = 111; - -const ResIDType kReactorUndoHilitePICTID = 900; - -const int16 kMars52Compass = 90; -const int16 kMars54Compass = 180; -const int16 kMars56Compass = 270; -const int16 kMars58Compass = 0; +static const ExtraID kMarsArrivalFromTSA = 0; +static const ExtraID kMars0AWatchShuttleDepart = 1; +static const ExtraID kRobotThrowsPlayer = 2; +static const ExtraID kMarsInfoKioskIntro = 3; +static const ExtraID kMarsColonyInfo = 4; +static const ExtraID kMarsSightsInfo = 5; +static const ExtraID kRobotOnWayToShuttle = 6; +static const ExtraID kMars31SouthZoomInNoCard = 7; +static const ExtraID kMars31SouthViewNoCard = 8; +static const ExtraID kMars31SouthZoomOutNoCard = 9; +static const ExtraID kMars31SouthZoomViewNoCard = 10; +static const ExtraID kMars33SlideShow1 = 11; +static const ExtraID kMars33SlideShow2 = 12; +static const ExtraID kMars33SlideShow3 = 13; +static const ExtraID kMars33SlideShow4 = 14; +static const ExtraID kMars34SpotOpenWithBar = 15; +static const ExtraID kMars34SpotCloseWithBar = 16; +static const ExtraID kMars34SpotOpenNoBar = 17; +static const ExtraID kMars34SpotCloseNoBar = 18; +static const ExtraID kMars34ViewOpenWithBar = 19; +static const ExtraID kMars34ViewOpenNoBar = 20; +static const ExtraID kMars34NorthPodGreeting = 21; +static const ExtraID kMarsTurnOnPod = 22; +static const ExtraID kMarsTakePodToMars45 = 23; +static const ExtraID kMars35WestSpinAirlockToEast = 24; +static const ExtraID kMars35EastSpinAirlockToWest = 25; +static const ExtraID kMars45SpotOpenWithBar = 26; +static const ExtraID kMars45SpotCloseWithBar = 27; +static const ExtraID kMars45SpotOpenNoBar = 28; +static const ExtraID kMars45SpotCloseNoBar = 29; +static const ExtraID kMars45ViewOpenWithBar = 30; +static const ExtraID kMars45ViewOpenNoBar = 31; +static const ExtraID kMars48RobotApproaches = 32; +static const ExtraID kMars48RobotKillsPlayer = 33; +static const ExtraID kMars48RobotLoops = 34; +static const ExtraID kMars48RobotView = 35; +static const ExtraID kMars48RobotDefends = 36; +static const ExtraID kMars49SouthViewMaskFilling = 37; +static const ExtraID kMars52SpinLeft = 38; +static const ExtraID kMars52SpinRight = 39; +static const ExtraID kMars52Extend = 40; +static const ExtraID kMars53Retract = 41; +static const ExtraID kMars54SpinLeft = 42; +static const ExtraID kMars54SpinRight = 43; +static const ExtraID kMars54Extend = 44; +static const ExtraID kMars55Retract = 45; +static const ExtraID kMars56SpinLeft = 46; +static const ExtraID kMars56SpinRight = 47; +static const ExtraID kMars56ExtendWithBomb = 48; +static const ExtraID kMars56ExtendNoBomb = 49; +static const ExtraID kMars57RetractWithBomb = 50; +static const ExtraID kMars57RetractNoBomb = 51; +static const ExtraID kMars57LowerScreenClosed = 52; +static const ExtraID kMars57CantOpenPanel = 53; +static const ExtraID kMars57FreezeLock = 54; +static const ExtraID kMars57BreakLock = 55; +static const ExtraID kMars57LockFrozenView = 56; +static const ExtraID kMars57ThawLock = 57; +static const ExtraID kMars57OpenPanel = 58; +static const ExtraID kMars57OpenPanelChoices = 59; +static const ExtraID kMars57ShieldEvaluation = 60; +static const ExtraID kMars57MeasureOutput = 61; +static const ExtraID kMars57ShieldOkayLoop = 62; +static const ExtraID kMars57RunDiagnostics = 63; +static const ExtraID kMars57BombExplodes = 64; +static const ExtraID kMars57BombAnalysis = 65; +static const ExtraID kMars57DontLink = 66; +static const ExtraID kMars57CircuitLink = 67; +static const ExtraID kMars57GameLevel1 = 68; +static const ExtraID kMars57GameLevel2 = 69; +static const ExtraID kMars57GameLevel3 = 70; +static const ExtraID kMars57BombExplodesInGame = 71; +static const ExtraID kMars57GameSolved = 72; +static const ExtraID kMars57ExposeBomb = 73; +static const ExtraID kMars57BackToNormal = 74; +static const ExtraID kMars57ViewOpenNoBomb = 75; +static const ExtraID kMars58SpinLeft = 76; +static const ExtraID kMars58SpinRight = 77; +static const ExtraID kMars58Extend = 78; +static const ExtraID kMars59Retract = 79; +static const ExtraID kMars60WestSpinAirlockToEast = 80; +static const ExtraID kMars60EastSpinAirlockToWest = 81; +static const ExtraID kMarsRobotHeadOpen = 82; +static const ExtraID kMarsRobotHeadClose = 83; +static const ExtraID kMarsRobotHead000 = 84; +static const ExtraID kMarsRobotHead001 = 85; +static const ExtraID kMarsRobotHead010 = 86; +static const ExtraID kMarsRobotHead011 = 87; +static const ExtraID kMarsRobotHead100 = 88; +static const ExtraID kMarsRobotHead101 = 89; +static const ExtraID kMarsRobotHead110 = 90; +static const ExtraID kMarsRobotHead111 = 91; +static const ExtraID kMarsMaze007RobotApproach = 92; +static const ExtraID kMarsMaze007RobotLoop = 93; +static const ExtraID kMarsMaze007RobotDeath = 94; +static const ExtraID kMarsMaze015SouthRobotApproach = 95; +static const ExtraID kMarsMaze015SouthRobotLoop = 96; +static const ExtraID kMarsMaze015SouthRobotDeath = 97; +static const ExtraID kMarsMaze101EastRobotApproach = 98; +static const ExtraID kMarsMaze101EastRobotLoop = 99; +static const ExtraID kMarsMaze101EastRobotDeath = 100; +static const ExtraID kMarsMaze104WestLoop = 101; +static const ExtraID kMarsMaze104WestDeath = 102; +static const ExtraID kMarsMaze133SouthApproach = 103; +static const ExtraID kMarsMaze133SouthLoop = 104; +static const ExtraID kMarsMaze133SouthDeath = 105; +static const ExtraID kMarsMaze136NorthApproach = 106; +static const ExtraID kMarsMaze136NorthLoop = 107; +static const ExtraID kMarsMaze136NorthDeath = 108; +static const ExtraID kMarsMaze184WestLoop = 109; +static const ExtraID kMarsMaze184WestDeath = 110; +static const ExtraID kMars200DeathInBucket = 111; + +static const ResIDType kReactorUndoHilitePICTID = 900; + +static const int16 kMars52Compass = 90; +static const int16 kMars54Compass = 180; +static const int16 kMars56Compass = 270; +static const int16 kMars58Compass = 0; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/mars/energybeam.cpp b/engines/pegasus/neighborhood/mars/energybeam.cpp index 85a1596b94..964c8ba381 100755 --- a/engines/pegasus/neighborhood/mars/energybeam.cpp +++ b/engines/pegasus/neighborhood/mars/energybeam.cpp @@ -28,14 +28,14 @@ namespace Pegasus { -const TimeValue kEnergyBeamTime = kOneSecond * kShuttleWeaponScale / 2; +static const TimeValue kEnergyBeamTime = kOneSecond * kShuttleWeaponScale / 2; -const CoordType kEnergyBeamOriginH = kShuttleWindowMidH; -const CoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight; +static const CoordType kEnergyBeamOriginH = kShuttleWindowMidH; +static const CoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight; -const float kBeamXOrigin = convertScreenHToSpaceX(kEnergyBeamOriginH, kEnergyBeamMinDistance); -const float kBeamYOrigin = convertScreenVToSpaceY(kEnergyBeamOriginV, kEnergyBeamMinDistance); -const float kBeamZOrigin = kEnergyBeamMinDistance; +static const float kBeamXOrigin = convertScreenHToSpaceX(kEnergyBeamOriginH, kEnergyBeamMinDistance); +static const float kBeamYOrigin = convertScreenVToSpaceY(kEnergyBeamOriginV, kEnergyBeamMinDistance); +static const float kBeamZOrigin = kEnergyBeamMinDistance; EnergyBeam::EnergyBeam() { _weaponDuration = kEnergyBeamTime; diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp index d383cc34ab..140bd12fc0 100755 --- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp +++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp @@ -29,22 +29,22 @@ namespace Pegasus { -const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale; +static const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale; -const CoordType kGravitonOriginH = kShuttleWindowLeft - 1; -const CoordType kGravitonOriginV = kShuttleWindowMidV; +static const CoordType kGravitonOriginH = kShuttleWindowLeft - 1; +static const CoordType kGravitonOriginV = kShuttleWindowMidV; -const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance); -const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); -const float kGravitonZOrigin = kGravitonMinDistance; +static const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance); +static const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); +static const float kGravitonZOrigin = kGravitonMinDistance; // Width of graviton sprite... -const CoordType kGravitonMaxScreenWidth = 78; -const CoordType kGravitonMaxScreenHeight = 46; +static const CoordType kGravitonMaxScreenWidth = 78; +static const CoordType kGravitonMaxScreenHeight = 46; -const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance) +static const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance) - convertScreenHToSpaceX(kShuttleWindowMidH - kGravitonMaxScreenWidth / 2, kGravitonMinDistance); -const float kGravitonHeight = convertScreenVToSpaceY(kShuttleWindowMidV - kGravitonMaxScreenHeight / 2, kGravitonMinDistance) +static const float kGravitonHeight = convertScreenVToSpaceY(kShuttleWindowMidV - kGravitonMaxScreenHeight / 2, kGravitonMinDistance) - convertScreenVToSpaceY(kShuttleWindowMidV + kGravitonMaxScreenHeight / 2, kGravitonMinDistance); GravitonCannon::GravitonCannon() { diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp index 93f99904d7..c950a85897 100755 --- a/engines/pegasus/neighborhood/mars/mars.cpp +++ b/engines/pegasus/neighborhood/mars/mars.cpp @@ -40,23 +40,23 @@ namespace Pegasus { // This should really be 22.5. // Probably no one will know the difference. -const int16 kMarsShieldPanelOffsetAngle = 22; +static const int16 kMarsShieldPanelOffsetAngle = 22; -const CanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1; +static const CanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1; -const NotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1; -const NotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1; -const NotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1; +static const NotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1; +static const NotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1; +static const NotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1; -const NotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag | +static const NotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag | kExplosionFinishedFlag | kTimeToTransportFlag; -const TimeValue kLittleExplosionStart = 0 * 40; -const TimeValue kLittleExplosionStop = 24 * 40; +static const TimeValue kLittleExplosionStart = 0 * 40; +static const TimeValue kLittleExplosionStop = 24 * 40; -const TimeValue kBigExplosionStart = 24 * 40; -const TimeValue kBigExplosionStop = 62 * 40; +static const TimeValue kBigExplosionStart = 24 * 40; +static const TimeValue kBigExplosionStop = 62 * 40; enum { kMaze007RobotLoopingEvent, diff --git a/engines/pegasus/neighborhood/mars/planetmover.cpp b/engines/pegasus/neighborhood/mars/planetmover.cpp index 7a43c188f7..ef26a7b573 100755 --- a/engines/pegasus/neighborhood/mars/planetmover.cpp +++ b/engines/pegasus/neighborhood/mars/planetmover.cpp @@ -32,11 +32,11 @@ namespace Pegasus { -const TimeScale kRovingScale = kTractorBeamScale; -const TimeValue kRovingTime = kTenSeconds * kRovingScale; -const TimeValue kRovingSlop = kTwoSeconds * kRovingScale; +static const TimeScale kRovingScale = kTractorBeamScale; +static const TimeValue kRovingTime = kTenSeconds * kRovingScale; +static const TimeValue kRovingSlop = kTwoSeconds * kRovingScale; -const CoordType kMaxVelocity = 20; +static const CoordType kMaxVelocity = 20; PlanetMover::PlanetMover() { setScale(kRovingScale); diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp index b1ecdde008..9776027839 100755 --- a/engines/pegasus/neighborhood/mars/robotship.cpp +++ b/engines/pegasus/neighborhood/mars/robotship.cpp @@ -33,25 +33,25 @@ namespace Pegasus { -const TimeScale kRovingScale = kTractorBeamScale; -const TimeValue kRovingTime = kSixSeconds * kRovingScale; -const TimeValue kRovingSlop = kThreeSeconds * kRovingScale; +static const TimeScale kRovingScale = kTractorBeamScale; +static const TimeValue kRovingTime = kSixSeconds * kRovingScale; +static const TimeValue kRovingSlop = kThreeSeconds * kRovingScale; -const int kNumSpriteColumns = 15; -const int kNumSpriteRows = 16; +static const int kNumSpriteColumns = 15; +static const int kNumSpriteRows = 16; -const CoordType kInitialLocationLeft = kShuttleWindowLeft - 50; -const CoordType kInitialLocationTop = kShuttleWindowTop - 50; -const CoordType kInitialLocationWidth = kShuttleWindowWidth + 100; -const CoordType kInitialLocationHeight = kShuttleWindowHeight + 100; +static const CoordType kInitialLocationLeft = kShuttleWindowLeft - 50; +static const CoordType kInitialLocationTop = kShuttleWindowTop - 50; +static const CoordType kInitialLocationWidth = kShuttleWindowWidth + 100; +static const CoordType kInitialLocationHeight = kShuttleWindowHeight + 100; -const CoordType kVelocityVectorLength = 100; -const CoordType kVelocityVectorSlop = 50; +static const CoordType kVelocityVectorLength = 100; +static const CoordType kVelocityVectorSlop = 50; -const CoordType kRovingLeft = kShuttleWindowLeft + 20; -const CoordType kRovingTop = kShuttleWindowTop + 20; -const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft; -const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop; +static const CoordType kRovingLeft = kShuttleWindowLeft + 20; +static const CoordType kRovingTop = kShuttleWindowTop + 20; +static const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft; +static const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop; RobotShip* g_robotShip = 0; diff --git a/engines/pegasus/neighborhood/mars/robotship.h b/engines/pegasus/neighborhood/mars/robotship.h index 7921198d48..b668e8f154 100755 --- a/engines/pegasus/neighborhood/mars/robotship.h +++ b/engines/pegasus/neighborhood/mars/robotship.h @@ -30,8 +30,8 @@ namespace Pegasus { -const CoordType kShuttleMovieWidth = 114; -const CoordType kShuttleMovieHeight = 42; +static const CoordType kShuttleMovieWidth = 114; +static const CoordType kShuttleMovieHeight = 42; class RobotShip : IdlerTimeBase { friend void timeToDropJunkFunction(FunctionPtr *, void *); diff --git a/engines/pegasus/neighborhood/mars/shuttleenergymeter.h b/engines/pegasus/neighborhood/mars/shuttleenergymeter.h index 169a0f63cd..51161e094e 100755 --- a/engines/pegasus/neighborhood/mars/shuttleenergymeter.h +++ b/engines/pegasus/neighborhood/mars/shuttleenergymeter.h @@ -31,16 +31,16 @@ namespace Pegasus { -const int32 kFullShuttleEnergy = 100; +static const int32 kFullShuttleEnergy = 100; // Low is 20 percent -const int32 kLowShuttleEnergy = kFullShuttleEnergy * 20 / 100; +static const int32 kLowShuttleEnergy = kFullShuttleEnergy * 20 / 100; -const int32 kMinDampingEnergy = 15; -const int32 kMinGravitonEnergy = 63; +static const int32 kMinDampingEnergy = 15; +static const int32 kMinGravitonEnergy = 63; -const TimeScale kTractorBeamScale = kFifteenTicksPerSecond; -const TimeValue kTractorBeamTime = kFiveSeconds * kTractorBeamScale; -const int32 kTractorBeamEnergy = kLowShuttleEnergy; +static const TimeScale kTractorBeamScale = kFifteenTicksPerSecond; +static const TimeValue kTractorBeamTime = kFiveSeconds * kTractorBeamScale; +static const int32 kTractorBeamEnergy = kLowShuttleEnergy; class ShuttleEnergyMeter : public FaderAnimation { public: diff --git a/engines/pegasus/neighborhood/mars/shuttlehud.cpp b/engines/pegasus/neighborhood/mars/shuttlehud.cpp index cac188e01e..14f5b88319 100755 --- a/engines/pegasus/neighborhood/mars/shuttlehud.cpp +++ b/engines/pegasus/neighborhood/mars/shuttlehud.cpp @@ -30,26 +30,26 @@ namespace Pegasus { -const CoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16; -const CoordType kHUDTargetGridTop = kShuttleWindowTop + 8; -const CoordType kHUDTargetGridWidth = 328; -const CoordType kHUDTargetGridHeight = 206; - -const CoordType kHUDRS232Left = kHUDTargetGridLeft + 264; -const CoordType kHUDRS232Top = kHUDTargetGridTop + 2; - -const CoordType kHUDLockLeft = kShuttleWindowLeft + 101; -const CoordType kHUDLockTop = kShuttleWindowTop + 49; -const CoordType kHUDLockWidth = 145; -const CoordType kHUDLockHeight = 124; - -const CoordType kTractorLockWidth = 50; -const CoordType kTractorLockHeight = 30; - -const CoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2; -const CoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2; -const CoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth; -const CoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight; +static const CoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16; +static const CoordType kHUDTargetGridTop = kShuttleWindowTop + 8; +static const CoordType kHUDTargetGridWidth = 328; +static const CoordType kHUDTargetGridHeight = 206; + +static const CoordType kHUDRS232Left = kHUDTargetGridLeft + 264; +static const CoordType kHUDRS232Top = kHUDTargetGridTop + 2; + +static const CoordType kHUDLockLeft = kShuttleWindowLeft + 101; +static const CoordType kHUDLockTop = kShuttleWindowTop + 49; +static const CoordType kHUDLockWidth = 145; +static const CoordType kHUDLockHeight = 124; + +static const CoordType kTractorLockWidth = 50; +static const CoordType kTractorLockHeight = 30; + +static const CoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2; +static const CoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2; +static const CoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth; +static const CoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight; static const uint16 s_RS232Data[] = { 0xF0E1, 0xCE70, diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.h b/engines/pegasus/neighborhood/mars/shuttleweapon.h index 30e42face8..38529c8919 100755 --- a/engines/pegasus/neighborhood/mars/shuttleweapon.h +++ b/engines/pegasus/neighborhood/mars/shuttleweapon.h @@ -35,7 +35,7 @@ namespace Pegasus { // For now, no... // clone2727 adds: And now forever -const TimeScale kShuttleWeaponScale = kFifteenTicksPerSecond; +static const TimeScale kShuttleWeaponScale = kFifteenTicksPerSecond; class ShuttleWeapon : public IdlerAnimation { public: diff --git a/engines/pegasus/neighborhood/mars/spacechase3d.h b/engines/pegasus/neighborhood/mars/spacechase3d.h index 1e145a1770..f6815e69bd 100755 --- a/engines/pegasus/neighborhood/mars/spacechase3d.h +++ b/engines/pegasus/neighborhood/mars/spacechase3d.h @@ -32,8 +32,8 @@ namespace Pegasus { // This is approximately right for a field of view of 72 degrees // (Should be set to the tangent of FOV). -//const float kTangentFOV = 0.76254; -const float kTangentFOV = 1.0; +//static const float kTangentFOV = 0.76254; +static const float kTangentFOV = 1.0; // Define these as macros and they can be used to define constants... #define convertSpaceXToScreenH(x, z) \ @@ -63,7 +63,7 @@ struct Point3D { } }; -const int kScreenWidth = kShuttleWindowWidth; +static const int kScreenWidth = kShuttleWindowWidth; bool isNegative(int a); bool isPositive(int a); diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp index 28847136f6..9f34c21461 100755 --- a/engines/pegasus/neighborhood/mars/spacejunk.cpp +++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp @@ -29,15 +29,13 @@ namespace Pegasus { -//const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale; -//const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale; -const CoordType kMaxBounceSize = 90; -const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2; -const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2; - -const float kJunkXTarget = 0; -const float kJunkYTarget = 0; -const float kJunkZTarget = kJunkMinDistance; +static const CoordType kMaxBounceSize = 90; +static const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2; +static const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2; + +static const float kJunkXTarget = 0; +static const float kJunkYTarget = 0; +static const float kJunkZTarget = kJunkMinDistance; SpaceJunk *g_spaceJunk = 0; diff --git a/engines/pegasus/neighborhood/mars/spacejunk.h b/engines/pegasus/neighborhood/mars/spacejunk.h index 03943b92c9..f2dbf9a838 100755 --- a/engines/pegasus/neighborhood/mars/spacejunk.h +++ b/engines/pegasus/neighborhood/mars/spacejunk.h @@ -32,9 +32,9 @@ namespace Pegasus { -const CoordType kJunkMaxScreenSize = 250; +static const CoordType kJunkMaxScreenSize = 250; -const float kJunkSize = convertScreenVToSpaceY(kShuttleWindowMidV - kJunkMaxScreenSize / 2, kJunkMinDistance) - +static const float kJunkSize = convertScreenVToSpaceY(kShuttleWindowMidV - kJunkMaxScreenSize / 2, kJunkMinDistance) - convertScreenVToSpaceY(kShuttleWindowMidV + kJunkMaxScreenSize / 2, kJunkMinDistance); class SpaceJunk : public ScalingMovie, public Idler { diff --git a/engines/pegasus/neighborhood/mars/tractorbeam.cpp b/engines/pegasus/neighborhood/mars/tractorbeam.cpp index 5ea63a0934..81c96299cf 100755 --- a/engines/pegasus/neighborhood/mars/tractorbeam.cpp +++ b/engines/pegasus/neighborhood/mars/tractorbeam.cpp @@ -36,19 +36,19 @@ TractorBeam::TractorBeam() : DisplayElement(kNoDisplayElement) { } -const int kHalfWidth = kShuttleTractorWidth >> 1; -const int kHalfHeight = kShuttleTractorHeight >> 1; +static const int kHalfWidth = kShuttleTractorWidth >> 1; +static const int kHalfHeight = kShuttleTractorHeight >> 1; -const int kW3Vert = kHalfHeight * kHalfHeight * kHalfHeight; -const int kW3Div2Vert = kW3Vert >> 1; +static const int kW3Vert = kHalfHeight * kHalfHeight * kHalfHeight; +static const int kW3Div2Vert = kW3Vert >> 1; -const int kW3Horiz = kHalfWidth * kHalfWidth * kHalfWidth; -const int kW3Div2Horiz = kW3Horiz >> 1; +static const int kW3Horiz = kHalfWidth * kHalfWidth * kHalfWidth; +static const int kW3Div2Horiz = kW3Horiz >> 1; -const int kMaxLevel = 50; +static const int kMaxLevel = 50; -const int kAVert = -2 * kMaxLevel; -const int kBVert = 3 * kMaxLevel * kHalfHeight; +static const int kAVert = -2 * kMaxLevel; +static const int kBVert = 3 * kMaxLevel * kHalfHeight; #define READ_PIXEL(ptr) \ if (screen->format.bytesPerPixel == 2) \ diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h index 7b1f86780a..93d29b6622 100644 --- a/engines/pegasus/neighborhood/neighborhood.h +++ b/engines/pegasus/neighborhood/neighborhood.h @@ -52,22 +52,22 @@ namespace Pegasus { class PegasusEngine; // Pegasus Prime neighborhood id's -const NeighborhoodID kCaldoriaID = 0; -const NeighborhoodID kFullTSAID = 1; -const NeighborhoodID kFinalTSAID = 2; -const NeighborhoodID kTinyTSAID = 3; -const NeighborhoodID kPrehistoricID = 4; -const NeighborhoodID kMarsID = 5; -const NeighborhoodID kWSCID = 6; -const NeighborhoodID kNoradAlphaID = 7; -const NeighborhoodID kNoradDeltaID = 8; +static const NeighborhoodID kCaldoriaID = 0; +static const NeighborhoodID kFullTSAID = 1; +static const NeighborhoodID kFinalTSAID = 2; +static const NeighborhoodID kTinyTSAID = 3; +static const NeighborhoodID kPrehistoricID = 4; +static const NeighborhoodID kMarsID = 5; +static const NeighborhoodID kWSCID = 6; +static const NeighborhoodID kNoradAlphaID = 7; +static const NeighborhoodID kNoradDeltaID = 8; // The sub chase is not really a neighborhood, but we define a constant that is used // to allow an easy transition out of Norad Alpha. -const NeighborhoodID kNoradSubChaseID = 1000; +static const NeighborhoodID kNoradSubChaseID = 1000; -const TimeScale kDefaultLoopFadeScale = kThirtyTicksPerSecond; -const TimeValue kDefaultLoopFadeOut = kHalfSecondPerThirtyTicks; -const TimeValue kDefaultLoopFadeIn = kHalfSecondPerThirtyTicks; +static const TimeScale kDefaultLoopFadeScale = kThirtyTicksPerSecond; +static const TimeValue kDefaultLoopFadeOut = kHalfSecondPerThirtyTicks; +static const TimeValue kDefaultLoopFadeIn = kHalfSecondPerThirtyTicks; enum QueueRequestType { kNavExtraRequest, 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) { diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.h b/engines/pegasus/neighborhood/prehistoric/prehistoric.h index 786a7f7a61..2750fc0ee8 100755 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.h +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.h @@ -30,73 +30,73 @@ namespace Pegasus { -const TimeScale kPrehistoricMovieScale = 600; -const TimeScale kPrehistoricFramesPerSecond = 15; -const TimeScale kPrehistoricFrameDuration = 40; +static const TimeScale kPrehistoricMovieScale = 600; +static const TimeScale kPrehistoricFramesPerSecond = 15; +static const TimeScale kPrehistoricFrameDuration = 40; // Alternate IDs. -const AlternateID kAltPrehistoricNormal = 0; -const AlternateID kAltPrehistoricBridgeSet = 1; +static const AlternateID kAltPrehistoricNormal = 0; +static const AlternateID kAltPrehistoricBridgeSet = 1; // Room IDs. -const RoomID kPrehistoric01 = 0; -const RoomID kPrehistoric02 = 1; -const RoomID kPrehistoric03 = 2; -const RoomID kPrehistoric04 = 3; -const RoomID kPrehistoric05 = 4; -const RoomID kPrehistoric06 = 5; -const RoomID kPrehistoric07 = 6; -const RoomID kPrehistoric08 = 7; -const RoomID kPrehistoric09 = 8; -const RoomID kPrehistoric10 = 9; -const RoomID kPrehistoric11 = 10; -const RoomID kPrehistoric12 = 11; -const RoomID kPrehistoric13 = 12; -const RoomID kPrehistoric14 = 13; -const RoomID kPrehistoric15 = 14; -const RoomID kPrehistoric16 = 15; -const RoomID kPrehistoric17 = 16; -const RoomID kPrehistoric18 = 17; -const RoomID kPrehistoric19 = 18; -const RoomID kPrehistoric20 = 19; -const RoomID kPrehistoric21 = 20; -const RoomID kPrehistoric22 = 21; -const RoomID kPrehistoric22North = 22; -const RoomID kPrehistoric23 = 23; -const RoomID kPrehistoric24 = 24; -const RoomID kPrehistoric25 = 25; -const RoomID kPrehistoricDeath = 26; +static const RoomID kPrehistoric01 = 0; +static const RoomID kPrehistoric02 = 1; +static const RoomID kPrehistoric03 = 2; +static const RoomID kPrehistoric04 = 3; +static const RoomID kPrehistoric05 = 4; +static const RoomID kPrehistoric06 = 5; +static const RoomID kPrehistoric07 = 6; +static const RoomID kPrehistoric08 = 7; +static const RoomID kPrehistoric09 = 8; +static const RoomID kPrehistoric10 = 9; +static const RoomID kPrehistoric11 = 10; +static const RoomID kPrehistoric12 = 11; +static const RoomID kPrehistoric13 = 12; +static const RoomID kPrehistoric14 = 13; +static const RoomID kPrehistoric15 = 14; +static const RoomID kPrehistoric16 = 15; +static const RoomID kPrehistoric17 = 16; +static const RoomID kPrehistoric18 = 17; +static const RoomID kPrehistoric19 = 18; +static const RoomID kPrehistoric20 = 19; +static const RoomID kPrehistoric21 = 20; +static const RoomID kPrehistoric22 = 21; +static const RoomID kPrehistoric22North = 22; +static const RoomID kPrehistoric23 = 23; +static const RoomID kPrehistoric24 = 24; +static const RoomID kPrehistoric25 = 25; +static const RoomID kPrehistoricDeath = 26; // Hot Spot Activation IDs. -const HotSpotActivationID kActivationVaultClosed = 1; -const HotSpotActivationID kActivationVaultOpen = 2; +static const HotSpotActivationID kActivationVaultClosed = 1; +static const HotSpotActivationID kActivationVaultOpen = 2; // Hot Spot IDs. -const HotSpotID kPre18EastSpotID = 5000; -const HotSpotID kPre22NorthSpotID = 5001; -const HotSpotID kPre22NorthOutSpotID = 5002; -const HotSpotID kPre22NorthBreakerSpotID = 5003; -const HotSpotID kPrehistoricKeyDropSpotID = 5004; -const HotSpotID kPrehistoricHistoricalLogSpotID = 5005; +static const HotSpotID kPre18EastSpotID = 5000; +static const HotSpotID kPre22NorthSpotID = 5001; +static const HotSpotID kPre22NorthOutSpotID = 5002; +static const HotSpotID kPre22NorthBreakerSpotID = 5003; +static const HotSpotID kPrehistoricKeyDropSpotID = 5004; +static const HotSpotID kPrehistoricHistoricalLogSpotID = 5005; // Extra sequence IDs. -const ExtraID kPreArrivalFromTSA = 0; -const ExtraID kPre18EastBridgeOut = 1; -const ExtraID kPre18EastBridgeOn = 2; -const ExtraID kPre18EastZoom = 3; -const ExtraID kPre18EastZoomOut = 4; -const ExtraID kPre22ThrowBreaker = 5; -const ExtraID kPre25EastUnlockingVaultWithLog = 6; -const ExtraID kPre25EastVaultOpenWithLog = 7; -const ExtraID kPre25EastViewWithLog = 8; -const ExtraID kPre25EastUnlockingVaultNoLog = 9; -const ExtraID kPre25EastVaultOpenNoLog = 10; -const ExtraID kPre25EastViewNoLog = 11; +static const ExtraID kPreArrivalFromTSA = 0; +static const ExtraID kPre18EastBridgeOut = 1; +static const ExtraID kPre18EastBridgeOn = 2; +static const ExtraID kPre18EastZoom = 3; +static const ExtraID kPre18EastZoomOut = 4; +static const ExtraID kPre22ThrowBreaker = 5; +static const ExtraID kPre25EastUnlockingVaultWithLog = 6; +static const ExtraID kPre25EastVaultOpenWithLog = 7; +static const ExtraID kPre25EastViewWithLog = 8; +static const ExtraID kPre25EastUnlockingVaultNoLog = 9; +static const ExtraID kPre25EastVaultOpenNoLog = 10; +static const ExtraID kPre25EastViewNoLog = 11; class PegasusEngine; diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp index 5ee8fe4e44..c54e252a64 100755 --- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp +++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp @@ -41,357 +41,357 @@ namespace Pegasus { // TSA PICTs: -const ResIDType kTBPCloseBoxPICTID = 800; -const ResIDType kTBPRewindPICTID = 801; -const ResIDType kUnresolvedPICTID = 802; -const ResIDType kResolvedPICTID = 803; -const ResIDType kJumpMenuPICTID = 804; -const ResIDType kJumpMenuHilitedPICTID = 805; -const ResIDType kExitPICTID = 806; -const ResIDType kExitHilitedPICTID = 807; -const ResIDType kLeftRipPICTID = 808; -const ResIDType kComparisonCloseBoxPICTID = 809; -const ResIDType kComparisonLeftRewindPICTID = 810; -const ResIDType kComparisonRightRewindPICTID = 811; -const ResIDType kComparisonHiliteNoradPICTID = 812; -const ResIDType kComparisonHiliteMarsPICTID = 813; -const ResIDType kComparisonHiliteCaldoriaPICTID = 814; -const ResIDType kComparisonHiliteWSCPICTID = 815; -const ResIDType kComparisonChancesNoradPICTID = 816; -const ResIDType kComparisonChancesMarsPICTID = 817; -const ResIDType kComparisonChancesCaldoriaPICTID = 818; -const ResIDType kComparisonChancesWSCPICTID = 819; -const ResIDType kRedirectionCCRolloverPICTID = 820; -const ResIDType kRedirectionRRRolloverPICTID = 821; -const ResIDType kRedirectionFDRolloverPICTID = 822; -const ResIDType kRedirectionCCDoorPICTID = 823; -const ResIDType kRedirectionRRDoorPICTID = 824; -const ResIDType kRedirectionFDDoorPICTID = 825; -const ResIDType kRedirectionSecuredPICTID = 826; -const ResIDType kRedirectionNewTargetPICTID = 827; -const ResIDType kRedirectionClosePICTID = 828; - -const short kCompassShift = 15; - -const TimeScale kFullTSAMovieScale = 600; -const TimeScale kFullTSAFramesPerSecond = 15; -const TimeScale kFullTSAFrameDuration = 40; +static const ResIDType kTBPCloseBoxPICTID = 800; +static const ResIDType kTBPRewindPICTID = 801; +static const ResIDType kUnresolvedPICTID = 802; +static const ResIDType kResolvedPICTID = 803; +static const ResIDType kJumpMenuPICTID = 804; +static const ResIDType kJumpMenuHilitedPICTID = 805; +static const ResIDType kExitPICTID = 806; +static const ResIDType kExitHilitedPICTID = 807; +static const ResIDType kLeftRipPICTID = 808; +static const ResIDType kComparisonCloseBoxPICTID = 809; +static const ResIDType kComparisonLeftRewindPICTID = 810; +static const ResIDType kComparisonRightRewindPICTID = 811; +static const ResIDType kComparisonHiliteNoradPICTID = 812; +static const ResIDType kComparisonHiliteMarsPICTID = 813; +static const ResIDType kComparisonHiliteCaldoriaPICTID = 814; +static const ResIDType kComparisonHiliteWSCPICTID = 815; +static const ResIDType kComparisonChancesNoradPICTID = 816; +static const ResIDType kComparisonChancesMarsPICTID = 817; +static const ResIDType kComparisonChancesCaldoriaPICTID = 818; +static const ResIDType kComparisonChancesWSCPICTID = 819; +static const ResIDType kRedirectionCCRolloverPICTID = 820; +static const ResIDType kRedirectionRRRolloverPICTID = 821; +static const ResIDType kRedirectionFDRolloverPICTID = 822; +static const ResIDType kRedirectionCCDoorPICTID = 823; +static const ResIDType kRedirectionRRDoorPICTID = 824; +static const ResIDType kRedirectionFDDoorPICTID = 825; +static const ResIDType kRedirectionSecuredPICTID = 826; +static const ResIDType kRedirectionNewTargetPICTID = 827; +static const ResIDType kRedirectionClosePICTID = 828; + +static const int16 kCompassShift = 15; + +static const TimeScale kFullTSAMovieScale = 600; +static const TimeScale kFullTSAFramesPerSecond = 15; +static const TimeScale kFullTSAFrameDuration = 40; // Alternate IDs. -const AlternateID kAltTSANormal = 0; -const AlternateID kAltTSARobotsAtReadyRoom = 1; -const AlternateID kAltTSARobotsAtFrontDoor = 2; -const AlternateID kAltTSARedAlert = 3; +static const AlternateID kAltTSANormal = 0; +static const AlternateID kAltTSARobotsAtReadyRoom = 1; +static const AlternateID kAltTSARobotsAtFrontDoor = 2; +static const AlternateID kAltTSARedAlert = 3; // Room IDs. -const RoomID kTSA01 = 1; -const RoomID kTSA02 = 2; -const RoomID kTSA03 = 3; -const RoomID kTSA04 = 4; -const RoomID kTSA05 = 5; -const RoomID kTSA0A = 6; -const RoomID kTSA06 = 7; -const RoomID kTSA07 = 8; -const RoomID kTSA08 = 9; -const RoomID kTSA09 = 10; -const RoomID kTSA10 = 11; -const RoomID kTSA11 = 12; -const RoomID kTSA12 = 13; -const RoomID kTSA13 = 14; -const RoomID kTSA14 = 15; -const RoomID kTSA15 = 16; -const RoomID kTSA16 = 17; -const RoomID kTSA17 = 18; -const RoomID kTSA18 = 19; -const RoomID kTSA19 = 20; -const RoomID kTSA0B = 21; -const RoomID kTSA21Cyan = 22; -const RoomID kTSA22Cyan = 23; -const RoomID kTSA23Cyan = 24; -const RoomID kTSA24Cyan = 25; -const RoomID kTSA25Cyan = 26; -const RoomID kTSA21Red = 27; -const RoomID kTSA23Red = 29; -const RoomID kTSA24Red = 30; -const RoomID kTSA25Red = 31; -const RoomID kTSA26 = 32; -const RoomID kTSA27 = 33; -const RoomID kTSA28 = 34; -const RoomID kTSA29 = 35; -const RoomID kTSA30 = 36; -const RoomID kTSA31 = 37; -const RoomID kTSA32 = 38; -const RoomID kTSA33 = 39; -const RoomID kTSA34 = 40; -const RoomID kTSA35 = 41; -const RoomID kTSADeathRoom = 43; +static const RoomID kTSA01 = 1; +static const RoomID kTSA02 = 2; +static const RoomID kTSA03 = 3; +static const RoomID kTSA04 = 4; +static const RoomID kTSA05 = 5; +static const RoomID kTSA0A = 6; +static const RoomID kTSA06 = 7; +static const RoomID kTSA07 = 8; +static const RoomID kTSA08 = 9; +static const RoomID kTSA09 = 10; +static const RoomID kTSA10 = 11; +static const RoomID kTSA11 = 12; +static const RoomID kTSA12 = 13; +static const RoomID kTSA13 = 14; +static const RoomID kTSA14 = 15; +static const RoomID kTSA15 = 16; +static const RoomID kTSA16 = 17; +static const RoomID kTSA17 = 18; +static const RoomID kTSA18 = 19; +static const RoomID kTSA19 = 20; +static const RoomID kTSA0B = 21; +static const RoomID kTSA21Cyan = 22; +static const RoomID kTSA22Cyan = 23; +static const RoomID kTSA23Cyan = 24; +static const RoomID kTSA24Cyan = 25; +static const RoomID kTSA25Cyan = 26; +static const RoomID kTSA21Red = 27; +static const RoomID kTSA23Red = 29; +static const RoomID kTSA24Red = 30; +static const RoomID kTSA25Red = 31; +static const RoomID kTSA26 = 32; +static const RoomID kTSA27 = 33; +static const RoomID kTSA28 = 34; +static const RoomID kTSA29 = 35; +static const RoomID kTSA30 = 36; +static const RoomID kTSA31 = 37; +static const RoomID kTSA32 = 38; +static const RoomID kTSA33 = 39; +static const RoomID kTSA34 = 40; +static const RoomID kTSA35 = 41; +static const RoomID kTSADeathRoom = 43; // Hot Spot Activation IDs. -const HotSpotActivationID kActivateTSAReadyForCard = 1; -const HotSpotActivationID kActivateTSAReadyToTransport = 2; -const HotSpotActivationID kActivateTSARobotsAwake = 3; -const HotSpotActivationID kActivateTSA0BZoomedOut = 4; -const HotSpotActivationID kActivateTSA0BZoomedIn = 5; -const HotSpotActivationID kActivateTSA0BComparisonVideo = 6; -const HotSpotActivationID kActivationLogReaderOpen = 7; -const HotSpotActivationID kActivateTSA0BTBPVideo = 8; -const HotSpotActivationID kActivationDoesntHaveKey = 9; -const HotSpotActivationID kActivationKeyVaultOpen = 10; -const HotSpotActivationID kActivationDoesntHaveChips = 11; -const HotSpotActivationID kActivationChipVaultOpen = 12; -const HotSpotActivationID kActivationJumpToPrehistoric = 13; -const HotSpotActivationID kActivationJumpToNorad = 14; -const HotSpotActivationID kActivationJumpToMars = 15; -const HotSpotActivationID kActivationJumpToWSC = 16; -const HotSpotActivationID kActivationReadyToExit = 17; -const HotSpotActivationID kActivationReadyForJumpMenu = 18; -const HotSpotActivationID kActivationMainJumpMenu = 19; +static const HotSpotActivationID kActivateTSAReadyForCard = 1; +static const HotSpotActivationID kActivateTSAReadyToTransport = 2; +static const HotSpotActivationID kActivateTSARobotsAwake = 3; +static const HotSpotActivationID kActivateTSA0BZoomedOut = 4; +static const HotSpotActivationID kActivateTSA0BZoomedIn = 5; +static const HotSpotActivationID kActivateTSA0BComparisonVideo = 6; +static const HotSpotActivationID kActivationLogReaderOpen = 7; +static const HotSpotActivationID kActivateTSA0BTBPVideo = 8; +static const HotSpotActivationID kActivationDoesntHaveKey = 9; +static const HotSpotActivationID kActivationKeyVaultOpen = 10; +static const HotSpotActivationID kActivationDoesntHaveChips = 11; +static const HotSpotActivationID kActivationChipVaultOpen = 12; +static const HotSpotActivationID kActivationJumpToPrehistoric = 13; +static const HotSpotActivationID kActivationJumpToNorad = 14; +static const HotSpotActivationID kActivationJumpToMars = 15; +static const HotSpotActivationID kActivationJumpToWSC = 16; +static const HotSpotActivationID kActivationReadyToExit = 17; +static const HotSpotActivationID kActivationReadyForJumpMenu = 18; +static const HotSpotActivationID kActivationMainJumpMenu = 19; // Hot Spot IDs. -const HotSpotID kTSAGTCardDropSpotID = 5000; -const HotSpotID kTSAGTTokyoSpotID = 5001; -const HotSpotID kTSAGTCaldoriaSpotID = 5002; -const HotSpotID kTSAGTBeachSpotID = 5003; -const HotSpotID kTSAGTOtherSpotID = 5004; -const HotSpotID kTSA02DoorSpotID = 5005; -const HotSpotID kTSA03EastJimenezSpotID = 5006; -const HotSpotID kTSA03WestCrenshawSpotID = 5007; -const HotSpotID kTSA04EastMatsumotoSpotID = 5008; -const HotSpotID kTSA04WestCastilleSpotID = 5009; -const HotSpotID kTSA05EastSinclairSpotID = 5010; -const HotSpotID kTSA05WestWhiteSpotID = 5011; -const HotSpotID kTSA0AEastSpotID = 5012; -const HotSpotID kTSA0AWastSpotID = 5013; -const HotSpotID kTSA0BEastMonitorSpotID = 5014; -const HotSpotID kTSA0BEastMonitorOutSpotID = 5015; -const HotSpotID kTSA0BEastCompareNoradSpotID = 5016; -const HotSpotID kTSA0BEastCompareMarsSpotID = 5017; -const HotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018; -const HotSpotID kTSA0BEastCompareWSCSpotID = 5019; -const HotSpotID kTSA0BEastLeftRewindSpotID = 5020; -const HotSpotID kTSA0BEastLeftPlaySpotID = 5021; -const HotSpotID kTSA0BEastRightRewindSpotID = 5022; -const HotSpotID kTSA0BEastRightPlaySpotID = 5023; -const HotSpotID kTSA0BEastCloseVideoSpotID = 5024; -const HotSpotID kTSA0BNorthMonitorSpotID = 5025; -const HotSpotID kTSA0BNorthMonitorOutSpotID = 5026; -const HotSpotID kTSA0BNorthHistLogSpotID = 5027; -const HotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028; -const HotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029; -const HotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030; -const HotSpotID kTSA0BWestMonitorSpotID = 5031; -const HotSpotID kTSA0BWestMonitorOutSpotID = 5032; -const HotSpotID kTSA0BWestTheorySpotID = 5033; -const HotSpotID kTSA0BWestBackgroundSpotID = 5034; -const HotSpotID kTSA0BWestProcedureSpotID = 5035; -const HotSpotID kTSA0BWestCloseVideoSpotID = 5036; -const HotSpotID kTSA0BWestPlayVideoSpotID = 5037; -const HotSpotID kTSA0BWestRewindVideoSpotID = 5038; -const HotSpotID kTSA22EastMonitorSpotID = 5039; -const HotSpotID kTSA22EastKeySpotID = 5040; -const HotSpotID kTSA23WestMonitorSpotID = 5041; -const HotSpotID kTSA23WestChipsSpotID = 5042; -const HotSpotID kTSA34NorthDoorSpotID = 5043; -const HotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044; -const HotSpotID kTSA37NorthJumpToNoradSpotID = 5045; -const HotSpotID kTSA37NorthCancelNoradSpotID = 5046; -const HotSpotID kTSA37NorthJumpToMarsSpotID = 5047; -const HotSpotID kTSA37NorthCancelMarsSpotID = 5048; -const HotSpotID kTSA37NorthJumpToWSCSpotID = 5049; -const HotSpotID kTSA37NorthCancelWSCSpotID = 5050; -const HotSpotID kTSA37NorthExitSpotID = 5051; -const HotSpotID kTSA37NorthJumpMenuSpotID = 5052; -const HotSpotID kTSA37NorthNoradMenuSpotID = 5053; -const HotSpotID kTSA37NorthMarsMenuSpotID = 5054; -const HotSpotID kTSA37NorthWSCMenuSpotID = 5055; +static const HotSpotID kTSAGTCardDropSpotID = 5000; +static const HotSpotID kTSAGTTokyoSpotID = 5001; +static const HotSpotID kTSAGTCaldoriaSpotID = 5002; +static const HotSpotID kTSAGTBeachSpotID = 5003; +static const HotSpotID kTSAGTOtherSpotID = 5004; +static const HotSpotID kTSA02DoorSpotID = 5005; +static const HotSpotID kTSA03EastJimenezSpotID = 5006; +static const HotSpotID kTSA03WestCrenshawSpotID = 5007; +static const HotSpotID kTSA04EastMatsumotoSpotID = 5008; +static const HotSpotID kTSA04WestCastilleSpotID = 5009; +static const HotSpotID kTSA05EastSinclairSpotID = 5010; +static const HotSpotID kTSA05WestWhiteSpotID = 5011; +static const HotSpotID kTSA0AEastSpotID = 5012; +static const HotSpotID kTSA0AWastSpotID = 5013; +static const HotSpotID kTSA0BEastMonitorSpotID = 5014; +static const HotSpotID kTSA0BEastMonitorOutSpotID = 5015; +static const HotSpotID kTSA0BEastCompareNoradSpotID = 5016; +static const HotSpotID kTSA0BEastCompareMarsSpotID = 5017; +static const HotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018; +static const HotSpotID kTSA0BEastCompareWSCSpotID = 5019; +static const HotSpotID kTSA0BEastLeftRewindSpotID = 5020; +static const HotSpotID kTSA0BEastLeftPlaySpotID = 5021; +static const HotSpotID kTSA0BEastRightRewindSpotID = 5022; +static const HotSpotID kTSA0BEastRightPlaySpotID = 5023; +static const HotSpotID kTSA0BEastCloseVideoSpotID = 5024; +static const HotSpotID kTSA0BNorthMonitorSpotID = 5025; +static const HotSpotID kTSA0BNorthMonitorOutSpotID = 5026; +static const HotSpotID kTSA0BNorthHistLogSpotID = 5027; +static const HotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028; +static const HotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029; +static const HotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030; +static const HotSpotID kTSA0BWestMonitorSpotID = 5031; +static const HotSpotID kTSA0BWestMonitorOutSpotID = 5032; +static const HotSpotID kTSA0BWestTheorySpotID = 5033; +static const HotSpotID kTSA0BWestBackgroundSpotID = 5034; +static const HotSpotID kTSA0BWestProcedureSpotID = 5035; +static const HotSpotID kTSA0BWestCloseVideoSpotID = 5036; +static const HotSpotID kTSA0BWestPlayVideoSpotID = 5037; +static const HotSpotID kTSA0BWestRewindVideoSpotID = 5038; +static const HotSpotID kTSA22EastMonitorSpotID = 5039; +static const HotSpotID kTSA22EastKeySpotID = 5040; +static const HotSpotID kTSA23WestMonitorSpotID = 5041; +static const HotSpotID kTSA23WestChipsSpotID = 5042; +static const HotSpotID kTSA34NorthDoorSpotID = 5043; +static const HotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044; +static const HotSpotID kTSA37NorthJumpToNoradSpotID = 5045; +static const HotSpotID kTSA37NorthCancelNoradSpotID = 5046; +static const HotSpotID kTSA37NorthJumpToMarsSpotID = 5047; +static const HotSpotID kTSA37NorthCancelMarsSpotID = 5048; +static const HotSpotID kTSA37NorthJumpToWSCSpotID = 5049; +static const HotSpotID kTSA37NorthCancelWSCSpotID = 5050; +static const HotSpotID kTSA37NorthExitSpotID = 5051; +static const HotSpotID kTSA37NorthJumpMenuSpotID = 5052; +static const HotSpotID kTSA37NorthNoradMenuSpotID = 5053; +static const HotSpotID kTSA37NorthMarsMenuSpotID = 5054; +static const HotSpotID kTSA37NorthWSCMenuSpotID = 5055; // Extra sequence IDs. -const ExtraID kTSATransporterArrowLoop = 0; -const ExtraID kTSAArriveFromCaldoria = 1; -const ExtraID kTSAGTOtherChoice = 2; -const ExtraID kTSAGTCardSwipe = 3; -const ExtraID kTSAGTSelectCaldoria = 4; -const ExtraID kTSAGTGoToCaldoria = 5; -const ExtraID kTSAGTSelectBeach = 6; -const ExtraID kTSAGTGoToBeach = 7; -const ExtraID kTSAGTArriveAtBeach = 8; -const ExtraID kTSAGTSelectTokyo = 9; -const ExtraID kTSAGTGoToTokyo = 10; -const ExtraID kTSAGTArriveAtTokyo = 11; -const ExtraID kTSA02NorthZoomIn = 12; -const ExtraID kTSA02NorthTenSecondDoor = 13; -const ExtraID kTSA02NorthZoomOut = 14; -const ExtraID kTSA02NorthDoorWithAgent3 = 15; -const ExtraID kTSA03JimenezZoomIn = 16; -const ExtraID kTSA03JimenezSpeech = 17; -const ExtraID kTSA03JimenezZoomOut = 18; -const ExtraID kTSA03CrenshawZoomIn = 19; -const ExtraID kTSA03CrenshawSpeech = 20; -const ExtraID kTSA03CrenshawZoomOut = 21; -const ExtraID kTSA03SouthRobotDeath = 22; -const ExtraID kTSA04NorthRobotGreeting = 23; -const ExtraID kTSA04MatsumotoZoomIn = 24; -const ExtraID kTSA04MatsumotoSpeech = 25; -const ExtraID kTSA04MatsumotoZoomOut = 26; -const ExtraID kTSA04CastilleZoomIn = 27; -const ExtraID kTSA04CastilleSpeech = 28; -const ExtraID kTSA04CastilleZoomOut = 29; -const ExtraID kTSA05SinclairZoomIn = 30; -const ExtraID kTSA05SinclairSpeech = 31; -const ExtraID kTSA05SinclairZoomOut = 32; -const ExtraID kTSA05WhiteZoomIn = 33; -const ExtraID kTSA05WhiteSpeech = 34; -const ExtraID kTSA05WhiteZoomOut = 35; -const ExtraID kTSA0AEastRobot = 36; -const ExtraID kTSA0AWestRobot = 37; -const ExtraID kTSA16NorthRobotDeath = 38; -const ExtraID kTSA0BEastZoomIn = 39; -const ExtraID kTSA0BEastZoomedView = 40; -const ExtraID kTSA0BEastZoomOut = 41; -const ExtraID kTSA0BEastTurnLeft = 42; -const ExtraID kTSA0BComparisonStartup = 43; -const ExtraID kTSA0BComparisonView0000 = 44; -const ExtraID kTSA0BComparisonView0002 = 45; -const ExtraID kTSA0BComparisonView0020 = 46; -const ExtraID kTSA0BComparisonView0022 = 47; -const ExtraID kTSA0BComparisonView0200 = 48; -const ExtraID kTSA0BComparisonView0202 = 49; -const ExtraID kTSA0BComparisonView0220 = 50; -const ExtraID kTSA0BComparisonView0222 = 51; -const ExtraID kTSA0BComparisonView2000 = 52; -const ExtraID kTSA0BComparisonView2002 = 53; -const ExtraID kTSA0BComparisonView2020 = 54; -const ExtraID kTSA0BComparisonView2022 = 55; -const ExtraID kTSA0BComparisonView2200 = 56; -const ExtraID kTSA0BComparisonView2202 = 57; -const ExtraID kTSA0BComparisonView2220 = 58; -const ExtraID kTSA0BComparisonView2222 = 59; -const ExtraID kTSA0BNoradComparisonView = 60; -const ExtraID kTSA0BNoradUnaltered = 61; -const ExtraID kTSA0BNoradAltered = 62; -const ExtraID kTSA0BMarsComparisonView = 63; -const ExtraID kTSA0BMarsUnaltered = 64; -const ExtraID kTSA0BMarsAltered = 65; -const ExtraID kTSA0BWSCComparisonView = 66; -const ExtraID kTSA0BWSCUnaltered = 67; -const ExtraID kTSA0BWSCAltered = 68; -const ExtraID kTSA0BCaldoriaComparisonView = 69; -const ExtraID kTSA0BCaldoriaUnaltered = 70; -const ExtraID kTSA0BCaldoriaAltered = 71; -const ExtraID kTSA0BNorthZoomIn = 72; -const ExtraID kTSA0BNorthZoomedView = 73; -const ExtraID kTSA0BNorthZoomOut = 74; -const ExtraID kTSA0BNorthTurnLeft = 75; -const ExtraID kTSA0BNorthTurnRight = 76; -const ExtraID kTSA0BNorthHistLogOpen = 77; -const ExtraID kTSA0BNorthHistLogClose = 78; -const ExtraID kTSA0BNorthHistLogCloseWithLog = 79; -const ExtraID kTSA0BNorthCantChangeHistory = 80; -const ExtraID kTSA0BNorthYoureBusted = 81; -const ExtraID kTSA0BNorthFinallyHappened = 82; -const ExtraID kTSA0BShowRip1 = 83; -const ExtraID kTSA0BNorthRipView1 = 84; -const ExtraID kTSA0BShowRip2 = 85; -const ExtraID kTSA0BShowGuardRobots = 86; -const ExtraID kTSA0BAIInterruption = 87; -const ExtraID kTSA0BRobotsToCommandCenter = 88; -const ExtraID kTSA0BNorthRobotsAtCCView = 89; -const ExtraID kTSA0BNorthRobotsAtRRView = 90; -const ExtraID kTSA0BNorthRobotsAtFDView = 91; -const ExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92; -const ExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93; -const ExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94; -const ExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95; -const ExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96; -const ExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97; -const ExtraID kTSA0BWestZoomIn = 98; -const ExtraID kTSA0BWestZoomedView = 99; -const ExtraID kTSA0BWestZoomOut = 100; -const ExtraID kTSA0BWestTurnRight = 101; -const ExtraID kTSA0BTBPTheoryHighlight = 102; -const ExtraID kTSA0BTBPBackgroundHighlight = 103; -const ExtraID kTSA0BTBPProcedureHighlight = 104; -const ExtraID kTSA0BTBPTheory = 105; -const ExtraID kTSA0BTBPBackground = 106; -const ExtraID kTSA0BTBPProcedure = 107; -const ExtraID kTSA0BRipAlarmScreen = 108; -const ExtraID kTSA22RedEastZoomInSequence = 109; -const ExtraID kTSA22RedEastVaultViewWithKey = 110; -const ExtraID kTSA22RedEastVaultViewNoKey = 111; -const ExtraID kTSA23RedWestVaultZoomInSequence = 112; -const ExtraID kTSA23RedWestVaultViewWithChips = 113; -const ExtraID kTSA23RedWestVaultViewNoChips = 114; -const ExtraID kTSA25NorthDeniedNoKey = 115; -const ExtraID kTSA25NorthDeniedNoChip = 116; -const ExtraID kTSA25NorthPutOnSuit = 117; -const ExtraID kTSA25NorthAlreadyHaveSuit = 118; -const ExtraID kTSA25NorthDescending1 = 119; -const ExtraID kTSA25NorthDescending2 = 120; -const ExtraID kTSA37HorseToAI1 = 121; -const ExtraID kTSA37PegasusAI1 = 122; -const ExtraID kTSA37AI1ToCommissioner1 = 123; -const ExtraID kTSA37Commissioner1 = 124; -const ExtraID kTSA37Commissioner1ToZoom = 125; -const ExtraID kTSA37ZoomToPrehistoric = 126; -const ExtraID kTSA37PrehistoricToAI2 = 127; -const ExtraID kTSA37PegasusAI2 = 128; -const ExtraID kTSA37AI2ToPrehistoric = 129; -const ExtraID kTSA37PrehistoricToDepart = 130; -const ExtraID kTSA37PegasusDepart = 131; -const ExtraID kTSA37TimeJumpToPegasus = 132; -const ExtraID kTSA37RecallToDownload = 133; -const ExtraID kTSA37DownloadToColonel1 = 134; -const ExtraID kTSA37Colonel1 = 135; -const ExtraID kTSA37Colonel1ToReviewRequired = 136; -const ExtraID kTSA37ReviewRequiredToExit = 137; -const ExtraID kTSA37ExitHilited = 138; -const ExtraID kTSA37ExitToHorse = 139; -const ExtraID kTSA37HorseToColonel2 = 140; -const ExtraID kTSA37Colonel2 = 141; -const ExtraID kTSA37PegasusAI3 = 142; -const ExtraID kTSA37AI3ToHorse = 143; -const ExtraID kTSA37HorseToZoom = 144; -const ExtraID kTSA37ZoomToMainMenu = 145; -const ExtraID kTSA37MainMenuToAI4 = 146; -const ExtraID kTSA37PegasusAI4 = 147; -const ExtraID kTSA37AI4ToMainMenu = 148; -const ExtraID kTSA37JumpMenu000 = 149; -const ExtraID kTSA37JumpMenu001 = 150; -const ExtraID kTSA37JumpMenu010 = 151; -const ExtraID kTSA37JumpMenu011 = 152; -const ExtraID kTSA37JumpMenu100 = 153; -const ExtraID kTSA37JumpMenu101 = 154; -const ExtraID kTSA37JumpMenu110 = 155; -const ExtraID kTSA37JumpMenu111 = 156; -const ExtraID kTSA37JumpToWSCMenu = 157; -const ExtraID kTSA37CancelWSC = 158; -const ExtraID kTSA37JumpToWSC = 159; -const ExtraID kTSA37WSCToAI5 = 160; -const ExtraID kTSA37PegasusAI5 = 161; -const ExtraID kTSA37AI5ToWSC = 162; -const ExtraID kTSA37WSCToDepart = 163; -const ExtraID kTSA37JumpToMarsMenu = 164; -const ExtraID kTSA37CancelMars = 165; -const ExtraID kTSA37JumpToMars = 166; -const ExtraID kTSA37MarsToAI6 = 167; -const ExtraID kTSA37PegasusAI6 = 168; -const ExtraID kTSA37AI6ToMars = 169; -const ExtraID kTSA37MarsToDepart = 170; -const ExtraID kTSA37JumpToNoradMenu = 171; -const ExtraID kTSA37CancelNorad = 172; -const ExtraID kTSA37JumpToNorad = 173; -const ExtraID kTSA37NoradToAI7 = 174; -const ExtraID kTSA37PegasusAI7 = 175; -const ExtraID kTSA37AI7ToNorad = 176; -const ExtraID kTSA37NoradToDepart = 177; -const ExtraID kTSA37EnvironmentalScan = 178; -const ExtraID kTSA37DownloadToMainMenu = 179; -const ExtraID kTSA37DownloadToOpMemReview = 180; -const ExtraID kTSA37OpMemReviewToMainMenu = 181; -const ExtraID kTSA37OpMemReviewToAllClear = 182; -const ExtraID kTSA37AllClearToCongratulations = 183; -const ExtraID kTSA37Congratulations = 184; -const ExtraID kTSA37CongratulationsToExit = 185; +static const ExtraID kTSATransporterArrowLoop = 0; +static const ExtraID kTSAArriveFromCaldoria = 1; +static const ExtraID kTSAGTOtherChoice = 2; +static const ExtraID kTSAGTCardSwipe = 3; +static const ExtraID kTSAGTSelectCaldoria = 4; +static const ExtraID kTSAGTGoToCaldoria = 5; +static const ExtraID kTSAGTSelectBeach = 6; +static const ExtraID kTSAGTGoToBeach = 7; +static const ExtraID kTSAGTArriveAtBeach = 8; +static const ExtraID kTSAGTSelectTokyo = 9; +static const ExtraID kTSAGTGoToTokyo = 10; +static const ExtraID kTSAGTArriveAtTokyo = 11; +static const ExtraID kTSA02NorthZoomIn = 12; +static const ExtraID kTSA02NorthTenSecondDoor = 13; +static const ExtraID kTSA02NorthZoomOut = 14; +static const ExtraID kTSA02NorthDoorWithAgent3 = 15; +static const ExtraID kTSA03JimenezZoomIn = 16; +static const ExtraID kTSA03JimenezSpeech = 17; +static const ExtraID kTSA03JimenezZoomOut = 18; +static const ExtraID kTSA03CrenshawZoomIn = 19; +static const ExtraID kTSA03CrenshawSpeech = 20; +static const ExtraID kTSA03CrenshawZoomOut = 21; +static const ExtraID kTSA03SouthRobotDeath = 22; +static const ExtraID kTSA04NorthRobotGreeting = 23; +static const ExtraID kTSA04MatsumotoZoomIn = 24; +static const ExtraID kTSA04MatsumotoSpeech = 25; +static const ExtraID kTSA04MatsumotoZoomOut = 26; +static const ExtraID kTSA04CastilleZoomIn = 27; +static const ExtraID kTSA04CastilleSpeech = 28; +static const ExtraID kTSA04CastilleZoomOut = 29; +static const ExtraID kTSA05SinclairZoomIn = 30; +static const ExtraID kTSA05SinclairSpeech = 31; +static const ExtraID kTSA05SinclairZoomOut = 32; +static const ExtraID kTSA05WhiteZoomIn = 33; +static const ExtraID kTSA05WhiteSpeech = 34; +static const ExtraID kTSA05WhiteZoomOut = 35; +static const ExtraID kTSA0AEastRobot = 36; +static const ExtraID kTSA0AWestRobot = 37; +static const ExtraID kTSA16NorthRobotDeath = 38; +static const ExtraID kTSA0BEastZoomIn = 39; +static const ExtraID kTSA0BEastZoomedView = 40; +static const ExtraID kTSA0BEastZoomOut = 41; +static const ExtraID kTSA0BEastTurnLeft = 42; +static const ExtraID kTSA0BComparisonStartup = 43; +static const ExtraID kTSA0BComparisonView0000 = 44; +static const ExtraID kTSA0BComparisonView0002 = 45; +static const ExtraID kTSA0BComparisonView0020 = 46; +static const ExtraID kTSA0BComparisonView0022 = 47; +static const ExtraID kTSA0BComparisonView0200 = 48; +static const ExtraID kTSA0BComparisonView0202 = 49; +static const ExtraID kTSA0BComparisonView0220 = 50; +static const ExtraID kTSA0BComparisonView0222 = 51; +static const ExtraID kTSA0BComparisonView2000 = 52; +static const ExtraID kTSA0BComparisonView2002 = 53; +static const ExtraID kTSA0BComparisonView2020 = 54; +static const ExtraID kTSA0BComparisonView2022 = 55; +static const ExtraID kTSA0BComparisonView2200 = 56; +static const ExtraID kTSA0BComparisonView2202 = 57; +static const ExtraID kTSA0BComparisonView2220 = 58; +static const ExtraID kTSA0BComparisonView2222 = 59; +static const ExtraID kTSA0BNoradComparisonView = 60; +static const ExtraID kTSA0BNoradUnaltered = 61; +static const ExtraID kTSA0BNoradAltered = 62; +static const ExtraID kTSA0BMarsComparisonView = 63; +static const ExtraID kTSA0BMarsUnaltered = 64; +static const ExtraID kTSA0BMarsAltered = 65; +static const ExtraID kTSA0BWSCComparisonView = 66; +static const ExtraID kTSA0BWSCUnaltered = 67; +static const ExtraID kTSA0BWSCAltered = 68; +static const ExtraID kTSA0BCaldoriaComparisonView = 69; +static const ExtraID kTSA0BCaldoriaUnaltered = 70; +static const ExtraID kTSA0BCaldoriaAltered = 71; +static const ExtraID kTSA0BNorthZoomIn = 72; +static const ExtraID kTSA0BNorthZoomedView = 73; +static const ExtraID kTSA0BNorthZoomOut = 74; +static const ExtraID kTSA0BNorthTurnLeft = 75; +static const ExtraID kTSA0BNorthTurnRight = 76; +static const ExtraID kTSA0BNorthHistLogOpen = 77; +static const ExtraID kTSA0BNorthHistLogClose = 78; +static const ExtraID kTSA0BNorthHistLogCloseWithLog = 79; +static const ExtraID kTSA0BNorthCantChangeHistory = 80; +static const ExtraID kTSA0BNorthYoureBusted = 81; +static const ExtraID kTSA0BNorthFinallyHappened = 82; +static const ExtraID kTSA0BShowRip1 = 83; +static const ExtraID kTSA0BNorthRipView1 = 84; +static const ExtraID kTSA0BShowRip2 = 85; +static const ExtraID kTSA0BShowGuardRobots = 86; +static const ExtraID kTSA0BAIInterruption = 87; +static const ExtraID kTSA0BRobotsToCommandCenter = 88; +static const ExtraID kTSA0BNorthRobotsAtCCView = 89; +static const ExtraID kTSA0BNorthRobotsAtRRView = 90; +static const ExtraID kTSA0BNorthRobotsAtFDView = 91; +static const ExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92; +static const ExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93; +static const ExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94; +static const ExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95; +static const ExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96; +static const ExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97; +static const ExtraID kTSA0BWestZoomIn = 98; +static const ExtraID kTSA0BWestZoomedView = 99; +static const ExtraID kTSA0BWestZoomOut = 100; +static const ExtraID kTSA0BWestTurnRight = 101; +static const ExtraID kTSA0BTBPTheoryHighlight = 102; +static const ExtraID kTSA0BTBPBackgroundHighlight = 103; +static const ExtraID kTSA0BTBPProcedureHighlight = 104; +static const ExtraID kTSA0BTBPTheory = 105; +static const ExtraID kTSA0BTBPBackground = 106; +static const ExtraID kTSA0BTBPProcedure = 107; +static const ExtraID kTSA0BRipAlarmScreen = 108; +static const ExtraID kTSA22RedEastZoomInSequence = 109; +static const ExtraID kTSA22RedEastVaultViewWithKey = 110; +static const ExtraID kTSA22RedEastVaultViewNoKey = 111; +static const ExtraID kTSA23RedWestVaultZoomInSequence = 112; +static const ExtraID kTSA23RedWestVaultViewWithChips = 113; +static const ExtraID kTSA23RedWestVaultViewNoChips = 114; +static const ExtraID kTSA25NorthDeniedNoKey = 115; +static const ExtraID kTSA25NorthDeniedNoChip = 116; +static const ExtraID kTSA25NorthPutOnSuit = 117; +static const ExtraID kTSA25NorthAlreadyHaveSuit = 118; +static const ExtraID kTSA25NorthDescending1 = 119; +static const ExtraID kTSA25NorthDescending2 = 120; +static const ExtraID kTSA37HorseToAI1 = 121; +static const ExtraID kTSA37PegasusAI1 = 122; +static const ExtraID kTSA37AI1ToCommissioner1 = 123; +static const ExtraID kTSA37Commissioner1 = 124; +static const ExtraID kTSA37Commissioner1ToZoom = 125; +static const ExtraID kTSA37ZoomToPrehistoric = 126; +static const ExtraID kTSA37PrehistoricToAI2 = 127; +static const ExtraID kTSA37PegasusAI2 = 128; +static const ExtraID kTSA37AI2ToPrehistoric = 129; +static const ExtraID kTSA37PrehistoricToDepart = 130; +static const ExtraID kTSA37PegasusDepart = 131; +static const ExtraID kTSA37TimeJumpToPegasus = 132; +static const ExtraID kTSA37RecallToDownload = 133; +static const ExtraID kTSA37DownloadToColonel1 = 134; +static const ExtraID kTSA37Colonel1 = 135; +static const ExtraID kTSA37Colonel1ToReviewRequired = 136; +static const ExtraID kTSA37ReviewRequiredToExit = 137; +static const ExtraID kTSA37ExitHilited = 138; +static const ExtraID kTSA37ExitToHorse = 139; +static const ExtraID kTSA37HorseToColonel2 = 140; +static const ExtraID kTSA37Colonel2 = 141; +static const ExtraID kTSA37PegasusAI3 = 142; +static const ExtraID kTSA37AI3ToHorse = 143; +static const ExtraID kTSA37HorseToZoom = 144; +static const ExtraID kTSA37ZoomToMainMenu = 145; +static const ExtraID kTSA37MainMenuToAI4 = 146; +static const ExtraID kTSA37PegasusAI4 = 147; +static const ExtraID kTSA37AI4ToMainMenu = 148; +static const ExtraID kTSA37JumpMenu000 = 149; +static const ExtraID kTSA37JumpMenu001 = 150; +static const ExtraID kTSA37JumpMenu010 = 151; +static const ExtraID kTSA37JumpMenu011 = 152; +static const ExtraID kTSA37JumpMenu100 = 153; +static const ExtraID kTSA37JumpMenu101 = 154; +static const ExtraID kTSA37JumpMenu110 = 155; +static const ExtraID kTSA37JumpMenu111 = 156; +static const ExtraID kTSA37JumpToWSCMenu = 157; +static const ExtraID kTSA37CancelWSC = 158; +static const ExtraID kTSA37JumpToWSC = 159; +static const ExtraID kTSA37WSCToAI5 = 160; +static const ExtraID kTSA37PegasusAI5 = 161; +static const ExtraID kTSA37AI5ToWSC = 162; +static const ExtraID kTSA37WSCToDepart = 163; +static const ExtraID kTSA37JumpToMarsMenu = 164; +static const ExtraID kTSA37CancelMars = 165; +static const ExtraID kTSA37JumpToMars = 166; +static const ExtraID kTSA37MarsToAI6 = 167; +static const ExtraID kTSA37PegasusAI6 = 168; +static const ExtraID kTSA37AI6ToMars = 169; +static const ExtraID kTSA37MarsToDepart = 170; +static const ExtraID kTSA37JumpToNoradMenu = 171; +static const ExtraID kTSA37CancelNorad = 172; +static const ExtraID kTSA37JumpToNorad = 173; +static const ExtraID kTSA37NoradToAI7 = 174; +static const ExtraID kTSA37PegasusAI7 = 175; +static const ExtraID kTSA37AI7ToNorad = 176; +static const ExtraID kTSA37NoradToDepart = 177; +static const ExtraID kTSA37EnvironmentalScan = 178; +static const ExtraID kTSA37DownloadToMainMenu = 179; +static const ExtraID kTSA37DownloadToOpMemReview = 180; +static const ExtraID kTSA37OpMemReviewToMainMenu = 181; +static const ExtraID kTSA37OpMemReviewToAllClear = 182; +static const ExtraID kTSA37AllClearToCongratulations = 183; +static const ExtraID kTSA37Congratulations = 184; +static const ExtraID kTSA37CongratulationsToExit = 185; const DisplayOrder kRipTimerOrder = kMonitorLayer; @@ -495,31 +495,31 @@ const CoordType kRedirectionNewTargetTop = kNavAreaTop + 166; const CoordType kRedirectionCloseLeft = kNavAreaLeft + 56; const CoordType kRedirectionCloseTop = kNavAreaTop + 220; -const TimeValue kTSABumpIntoWallIn = 0; -const TimeValue kTSABumpIntoWallOut = 148; +static const TimeValue kTSABumpIntoWallIn = 0; +static const TimeValue kTSABumpIntoWallOut = 148; -const TimeValue kTSAGTDoorCloseIn = 148; -const TimeValue kTSAGTDoorCloseOut = 1570; +static const TimeValue kTSAGTDoorCloseIn = 148; +static const TimeValue kTSAGTDoorCloseOut = 1570; -const TimeValue kTSANoOtherDestinationIn = 1570; -const TimeValue kTSANoOtherDestinationOut = 3601; +static const TimeValue kTSANoOtherDestinationIn = 1570; +static const TimeValue kTSANoOtherDestinationOut = 3601; -const TimeValue kTSAEntryDoorCloseIn = 3601; -const TimeValue kTSAEntryDoorCloseOut = 4200; +static const TimeValue kTSAEntryDoorCloseIn = 3601; +static const TimeValue kTSAEntryDoorCloseOut = 4200; -const TimeValue kTSAInsideDoorCloseIn = 4200; -const TimeValue kTSAInsideDoorCloseOut = 4800; +static const TimeValue kTSAInsideDoorCloseIn = 4200; +static const TimeValue kTSAInsideDoorCloseOut = 4800; -const TimeValue kTSAVaultCloseIn = 4800; -const TimeValue kTSAVaultCloseOut = 5388; +static const TimeValue kTSAVaultCloseIn = 4800; +static const TimeValue kTSAVaultCloseOut = 5388; -const TimeValue kTSAPegasusDoorCloseIn = 5388; -const TimeValue kTSAPegasusDoorCloseOut = 6457; +static const TimeValue kTSAPegasusDoorCloseIn = 5388; +static const TimeValue kTSAPegasusDoorCloseOut = 6457; -const bool kPegasusUnresolved = false; -const bool kPegasusResolved = true; -const bool kPegasusCantExit = false; -const bool kPegasusCanExit = true; +static const bool kPegasusUnresolved = false; +static const bool kPegasusResolved = true; +static const bool kPegasusCantExit = false; +static const bool kPegasusCanExit = true; // Monitor modes enum { @@ -582,15 +582,15 @@ static const ExtraID s_historicalLogViews[16] = { kTSA0BComparisonView2222 }; -const long kRedirectionCCRolloverSprite = 0; -const long kRedirectionRRRolloverSprite = 1; -const long kRedirectionFDRolloverSprite = 2; -const long kRedirectionCCDoorSprite = 3; -const long kRedirectionRRDoorSprite = 4; -const long kRedirectionFDDoorSprite = 5; -const long kRedirectionCloseSprite = 6; -const long kRedirectionSecuredSprite = 0; -const long kRedirectionNewTargetSprite = 1; +static const int kRedirectionCCRolloverSprite = 0; +static const int kRedirectionRRRolloverSprite = 1; +static const int kRedirectionFDRolloverSprite = 2; +static const int kRedirectionCCDoorSprite = 3; +static const int kRedirectionRRDoorSprite = 4; +static const int kRedirectionFDDoorSprite = 5; +static const int kRedirectionCloseSprite = 6; +static const int kRedirectionSecuredSprite = 0; +static const int kRedirectionNewTargetSprite = 1; void RipTimer::initImage() { _middle = -1; diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.h b/engines/pegasus/neighborhood/tsa/fulltsa.h index cc0ce6221f..0a3f8a293c 100755 --- a/engines/pegasus/neighborhood/tsa/fulltsa.h +++ b/engines/pegasus/neighborhood/tsa/fulltsa.h @@ -49,9 +49,9 @@ protected: // Room IDs. -const RoomID kTSA00 = 0; -const RoomID kTSA22Red = 28; -const RoomID kTSA37 = 42; +static const RoomID kTSA00 = 0; +static const RoomID kTSA22Red = 28; +static const RoomID kTSA37 = 42; class FullTSA : public Neighborhood { friend void uncreatedInTSAFunction(FunctionPtr *, void *tsa); diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp index 823aa17d6c..2fa6c5377a 100755 --- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp +++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp @@ -36,73 +36,73 @@ namespace Pegasus { -const short kCompassShift = 30; +static const int16 kCompassShift = 30; -const TimeScale kTinyTSAMovieScale = 600; -const TimeScale kTinyTSAFramesPerSecond = 15; -const TimeScale kTinyTSAFrameDuration = 40; +static const TimeScale kTinyTSAMovieScale = 600; +static const TimeScale kTinyTSAFramesPerSecond = 15; +static const TimeScale kTinyTSAFrameDuration = 40; // Alternate IDs. -const AlternateID kAltTinyTSANormal = 0; +static const AlternateID kAltTinyTSANormal = 0; // Hot Spot Activation IDs. -const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1; -const HotSpotActivationID kActivationTinyTSAJumpToMars = 2; -const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3; -const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4; -const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5; +static const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1; +static const HotSpotActivationID kActivationTinyTSAJumpToMars = 2; +static const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3; +static const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4; +static const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5; // Hot Spot IDs. -const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000; -const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001; -const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002; -const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003; -const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004; -const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005; -const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006; -const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007; -const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008; -const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009; +static const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000; +static const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001; +static const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002; +static const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003; +static const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004; +static const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005; +static const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006; +static const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007; +static const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008; +static const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009; // Extra sequence IDs. -const ExtraID kTinyTSA37PegasusDepart = 0; -const ExtraID kTinyTSA37TimeJumpToPegasus = 1; -const ExtraID kTinyTSA37RecallToDownload = 2; -const ExtraID kTinyTSA37ExitHilited = 3; -const ExtraID kTinyTSA37ExitToHorse = 4; -const ExtraID kTinyTSA37JumpMenu000 = 5; -const ExtraID kTinyTSA37JumpMenu001 = 6; -const ExtraID kTinyTSA37JumpMenu010 = 7; -const ExtraID kTinyTSA37JumpMenu011 = 8; -const ExtraID kTinyTSA37JumpMenu100 = 9; -const ExtraID kTinyTSA37JumpMenu101 = 10; -const ExtraID kTinyTSA37JumpMenu110 = 11; -const ExtraID kTinyTSA37JumpMenu111 = 12; -const ExtraID kTinyTSA37JumpToWSCMenu = 13; -const ExtraID kTinyTSA37CancelWSC = 14; -const ExtraID kTinyTSA37JumpToWSC = 15; -const ExtraID kTinyTSA37WSCToAI5 = 16; -const ExtraID kTinyTSA37PegasusAI5 = 17; -const ExtraID kTinyTSA37AI5ToWSC = 18; -const ExtraID kTinyTSA37WSCToDepart = 19; -const ExtraID kTinyTSA37JumpToMarsMenu = 20; -const ExtraID kTinyTSA37CancelMars = 21; -const ExtraID kTinyTSA37JumpToMars = 22; -const ExtraID kTinyTSA37MarsToAI6 = 23; -const ExtraID kTinyTSA37PegasusAI6 = 24; -const ExtraID kTinyTSA37AI6ToMars = 25; -const ExtraID kTinyTSA37MarsToDepart = 26; -const ExtraID kTinyTSA37JumpToNoradMenu = 27; -const ExtraID kTinyTSA37CancelNorad = 28; -const ExtraID kTinyTSA37JumpToNorad = 29; -const ExtraID kTinyTSA37NoradToAI7 = 30; -const ExtraID kTinyTSA37PegasusAI7 = 31; -const ExtraID kTinyTSA37AI7ToNorad = 32; -const ExtraID kTinyTSA37NoradToDepart = 33; -const ExtraID kTinyTSA37EnvironmentalScan = 34; -const ExtraID kTinyTSA37DownloadToMainMenu = 35; -const ExtraID kTinyTSA37DownloadToOpMemReview = 36; -const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37; +static const ExtraID kTinyTSA37PegasusDepart = 0; +static const ExtraID kTinyTSA37TimeJumpToPegasus = 1; +static const ExtraID kTinyTSA37RecallToDownload = 2; +static const ExtraID kTinyTSA37ExitHilited = 3; +static const ExtraID kTinyTSA37ExitToHorse = 4; +static const ExtraID kTinyTSA37JumpMenu000 = 5; +static const ExtraID kTinyTSA37JumpMenu001 = 6; +static const ExtraID kTinyTSA37JumpMenu010 = 7; +static const ExtraID kTinyTSA37JumpMenu011 = 8; +static const ExtraID kTinyTSA37JumpMenu100 = 9; +static const ExtraID kTinyTSA37JumpMenu101 = 10; +static const ExtraID kTinyTSA37JumpMenu110 = 11; +static const ExtraID kTinyTSA37JumpMenu111 = 12; +static const ExtraID kTinyTSA37JumpToWSCMenu = 13; +static const ExtraID kTinyTSA37CancelWSC = 14; +static const ExtraID kTinyTSA37JumpToWSC = 15; +static const ExtraID kTinyTSA37WSCToAI5 = 16; +static const ExtraID kTinyTSA37PegasusAI5 = 17; +static const ExtraID kTinyTSA37AI5ToWSC = 18; +static const ExtraID kTinyTSA37WSCToDepart = 19; +static const ExtraID kTinyTSA37JumpToMarsMenu = 20; +static const ExtraID kTinyTSA37CancelMars = 21; +static const ExtraID kTinyTSA37JumpToMars = 22; +static const ExtraID kTinyTSA37MarsToAI6 = 23; +static const ExtraID kTinyTSA37PegasusAI6 = 24; +static const ExtraID kTinyTSA37AI6ToMars = 25; +static const ExtraID kTinyTSA37MarsToDepart = 26; +static const ExtraID kTinyTSA37JumpToNoradMenu = 27; +static const ExtraID kTinyTSA37CancelNorad = 28; +static const ExtraID kTinyTSA37JumpToNorad = 29; +static const ExtraID kTinyTSA37NoradToAI7 = 30; +static const ExtraID kTinyTSA37PegasusAI7 = 31; +static const ExtraID kTinyTSA37AI7ToNorad = 32; +static const ExtraID kTinyTSA37NoradToDepart = 33; +static const ExtraID kTinyTSA37EnvironmentalScan = 34; +static const ExtraID kTinyTSA37DownloadToMainMenu = 35; +static const ExtraID kTinyTSA37DownloadToOpMemReview = 36; +static const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37; TinyTSA::TinyTSA(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "Tiny TSA", kTinyTSAID) { } diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.h b/engines/pegasus/neighborhood/tsa/tinytsa.h index d7dee7f2fb..db74206d4f 100755 --- a/engines/pegasus/neighborhood/tsa/tinytsa.h +++ b/engines/pegasus/neighborhood/tsa/tinytsa.h @@ -32,7 +32,7 @@ namespace Pegasus { // Room IDs. -const RoomID kTinyTSA37 = 0; +static const RoomID kTinyTSA37 = 0; class TinyTSA : public Neighborhood { public: diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp index 6bc3a85c3f..1f00999aa7 100755 --- a/engines/pegasus/neighborhood/wsc/wsc.cpp +++ b/engines/pegasus/neighborhood/wsc/wsc.cpp @@ -33,15 +33,15 @@ namespace Pegasus { -const CanMoveForwardReason kCantMoveWatchingDiagnosis = kCantMoveLastReason + 1; +static const CanMoveForwardReason kCantMoveWatchingDiagnosis = kCantMoveLastReason + 1; -const CanTurnReason kCantTurnWatchingDiagnosis = kCantTurnLastReason + 1; -const CanTurnReason kCantTurnWatchingAnalysis = kCantTurnWatchingDiagnosis + 1; -const CanTurnReason kCantTurnInMoleculeGame = kCantTurnWatchingAnalysis + 1; +static const CanTurnReason kCantTurnWatchingDiagnosis = kCantTurnLastReason + 1; +static const CanTurnReason kCantTurnWatchingAnalysis = kCantTurnWatchingDiagnosis + 1; +static const CanTurnReason kCantTurnInMoleculeGame = kCantTurnWatchingAnalysis + 1; -const TimeScale kMoleculesMovieScale = 600; -const TimeValue kMoleculeLoopTime = 4 * kMoleculesMovieScale; -const TimeValue kMoleculeFailTime = 2 * kMoleculesMovieScale; +static const TimeScale kMoleculesMovieScale = 600; +static const TimeValue kMoleculeLoopTime = 4 * kMoleculesMovieScale; +static const TimeValue kMoleculeFailTime = 2 * kMoleculesMovieScale; enum { kMoleculeLoop0Time = 0, @@ -59,7 +59,7 @@ enum { kMoleculeLoop6Time = kMoleculeFail5Time + kMoleculeFailTime }; -const TimeValue s_moleculeLoopTimes[] = { +static const TimeValue s_moleculeLoopTimes[] = { kMoleculeLoop0Time, kMoleculeLoop1Time, kMoleculeLoop2Time, @@ -69,7 +69,7 @@ const TimeValue s_moleculeLoopTimes[] = { kMoleculeLoop6Time }; -const TimeValue s_moleculeFailTimes[] = { +static const TimeValue s_moleculeFailTimes[] = { kMoleculeFail0Time, kMoleculeFail1Time, kMoleculeFail2Time, @@ -78,399 +78,399 @@ const TimeValue s_moleculeFailTimes[] = { kMoleculeFail5Time }; -const short kAuditoriumAngleOffset = 5; +static const int16 kAuditoriumAngleOffset = 5; -const long kPlasmaEnergyWithShield = kMaxJMPEnergy * 10 / 100; -const long kPlasmaEnergyNoShield = kMaxJMPEnergy * 20 / 100; +static const int kPlasmaEnergyWithShield = kMaxJMPEnergy * 10 / 100; +static const int kPlasmaEnergyNoShield = kMaxJMPEnergy * 20 / 100; -const long kTimerEventPlasmaHit = 0; -const long kTimerEventPlayerGawkingAtRobot = 1; -const long kTimerEventPlayerGawkingAtRobot2 = 2; +static const int kTimerEventPlasmaHit = 0; +static const int kTimerEventPlayerGawkingAtRobot = 1; +static const int kTimerEventPlayerGawkingAtRobot2 = 2; -const TimeValue kWSCMolecule1In = 0; -const TimeValue kWSCMolecule1Out = 937; +static const TimeValue kWSCMolecule1In = 0; +static const TimeValue kWSCMolecule1Out = 937; -const TimeValue kWSCMolecule2In = 937; -const TimeValue kWSCMolecule2Out = 1864; +static const TimeValue kWSCMolecule2In = 937; +static const TimeValue kWSCMolecule2Out = 1864; -const TimeValue kWSCMolecule3In = 1864; -const TimeValue kWSCMolecule3Out = 2790; +static const TimeValue kWSCMolecule3In = 1864; +static const TimeValue kWSCMolecule3Out = 2790; -const TimeValue kWSCClick1In = 2790; -const TimeValue kWSCClick1Out = 2890; +static const TimeValue kWSCClick1In = 2790; +static const TimeValue kWSCClick1Out = 2890; -const TimeValue kWSCClick2In = 2890; -const TimeValue kWSCClick2Out = 3059; +static const TimeValue kWSCClick2In = 2890; +static const TimeValue kWSCClick2Out = 3059; -const TimeValue kWSCClick3In = 3059; -const TimeValue kWSCClick3Out = 3156; +static const TimeValue kWSCClick3In = 3059; +static const TimeValue kWSCClick3Out = 3156; -const TimeValue kWSCFlashlightClickIn = 3156; -const TimeValue kWSCFlashlightClickOut = 3211; +static const TimeValue kWSCFlashlightClickIn = 3156; +static const TimeValue kWSCFlashlightClickOut = 3211; -const TimeValue kWSCBumpIntoWallIn = 3211; -const TimeValue kWSCBumpIntoWallOut = 3514; +static const TimeValue kWSCBumpIntoWallIn = 3211; +static const TimeValue kWSCBumpIntoWallOut = 3514; -const TimeValue kWSCCantTransportIn = 3514; -const TimeValue kWSCCantTransportOut = 7791; +static const TimeValue kWSCCantTransportIn = 3514; +static const TimeValue kWSCCantTransportOut = 7791; -const TimeValue kHernandezNotHomeIn = 7791; -const TimeValue kHernandezNotHomeOut = 10199; +static const TimeValue kHernandezNotHomeIn = 7791; +static const TimeValue kHernandezNotHomeOut = 10199; -const TimeValue kWashingtonNotHomeIn = 10199; -const TimeValue kWashingtonNotHomeOut = 12649; +static const TimeValue kWashingtonNotHomeIn = 10199; +static const TimeValue kWashingtonNotHomeOut = 12649; -const TimeValue kSullivanNotHomeIn = 12649; -const TimeValue kSullivanNotHomeOut = 15031; +static const TimeValue kSullivanNotHomeIn = 12649; +static const TimeValue kSullivanNotHomeOut = 15031; -const TimeValue kNakamuraNotHomeIn = 15031; -const TimeValue kNakamuraNotHomeOut = 17545; +static const TimeValue kNakamuraNotHomeIn = 15031; +static const TimeValue kNakamuraNotHomeOut = 17545; -const TimeValue kGrailisNotHomeIn = 17545; -const TimeValue kGrailisNotHomeOut = 19937; +static const TimeValue kGrailisNotHomeIn = 17545; +static const TimeValue kGrailisNotHomeOut = 19937; -const TimeValue kTheriaultNotHomeIn = 19937; -const TimeValue kTheriaultNotHomeOut = 22395; +static const TimeValue kTheriaultNotHomeIn = 19937; +static const TimeValue kTheriaultNotHomeOut = 22395; -const TimeValue kGlennerNotHomeIn = 22395; -const TimeValue kGlennerNotHomeOut = 24770; +static const TimeValue kGlennerNotHomeIn = 22395; +static const TimeValue kGlennerNotHomeOut = 24770; -const TimeValue kSinclairNotHomeIn = 24770; -const TimeValue kSinclairNotHomeOut = 27328; +static const TimeValue kSinclairNotHomeIn = 24770; +static const TimeValue kSinclairNotHomeOut = 27328; -const TimeValue kWSCLabClosedIn = 27328; -const TimeValue kWSCLabClosedOut = 28904; +static const TimeValue kWSCLabClosedIn = 27328; +static const TimeValue kWSCLabClosedOut = 28904; -const TimeValue kSlidingDoorCloseIn = 28904; -const TimeValue kSlidingDoorCloseOut = 29295; +static const TimeValue kSlidingDoorCloseIn = 28904; +static const TimeValue kSlidingDoorCloseOut = 29295; -const TimeValue kSlimyDoorCloseIn = 29295; -const TimeValue kSlimyDoorCloseOut = 29788; +static const TimeValue kSlimyDoorCloseIn = 29295; +static const TimeValue kSlimyDoorCloseOut = 29788; -const TimeValue kPaging1In = 29788; -const TimeValue kPaging1Out = 32501; +static const TimeValue kPaging1In = 29788; +static const TimeValue kPaging1Out = 32501; -const TimeValue kPaging2In = 32501; -const TimeValue kPaging2Out = 34892; +static const TimeValue kPaging2In = 32501; +static const TimeValue kPaging2Out = 34892; -const TimeValue kCheckInIn = 34892; -const TimeValue kCheckInOut = 37789; +static const TimeValue kCheckInIn = 34892; +static const TimeValue kCheckInOut = 37789; -const TimeValue kDrinkAntidoteIn = 37789; -const TimeValue kDrinkAntidoteOut = 39725; +static const TimeValue kDrinkAntidoteIn = 37789; +static const TimeValue kDrinkAntidoteOut = 39725; -const TimeScale kWSCMovieScale = 600; -const TimeScale kWSCFramesPerSecond = 15; -const TimeScale kWSCFrameDuration = 40; +static const TimeScale kWSCMovieScale = 600; +static const TimeScale kWSCFramesPerSecond = 15; +static const TimeScale kWSCFrameDuration = 40; // Alternate IDs. -const AlternateID kAltWSCNormal = 0; -const AlternateID kAltWSCTookMachineGun = 1; -const AlternateID kAltWSCW0ZDoorOpen = 2; -const AlternateID kAltWSCPeopleAtW19North = 3; +static const AlternateID kAltWSCNormal = 0; +static const AlternateID kAltWSCTookMachineGun = 1; +static const AlternateID kAltWSCW0ZDoorOpen = 2; +static const AlternateID kAltWSCPeopleAtW19North = 3; // Room IDs. -const RoomID kWSC02 = 1; -const RoomID kWSC03 = 4; -const RoomID kWSC04 = 5; -const RoomID kWSC06 = 6; -const RoomID kWSC07 = 7; -const RoomID kWSC08 = 8; -const RoomID kWSC09 = 9; -const RoomID kWSC10 = 10; -const RoomID kWSC11 = 11; -const RoomID kWSC13 = 12; -const RoomID kWSC14 = 13; -const RoomID kWSC15 = 14; -const RoomID kWSC16 = 15; -const RoomID kWSC17 = 16; -const RoomID kWSC18 = 17; -const RoomID kWSC19 = 18; -const RoomID kWSC20 = 19; -const RoomID kWSC21 = 20; -const RoomID kWSC22 = 21; -const RoomID kWSC23 = 22; -const RoomID kWSC24 = 23; -const RoomID kWSC25 = 24; -const RoomID kWSC26 = 25; -const RoomID kWSC27 = 26; -const RoomID kWSC28 = 27; -const RoomID kWSC29 = 28; -const RoomID kWSC31 = 29; -const RoomID kWSC32 = 30; -const RoomID kWSC33 = 31; -const RoomID kWSC34 = 32; -const RoomID kWSC35 = 33; -const RoomID kWSC36 = 34; -const RoomID kWSC37 = 35; -const RoomID kWSC38 = 36; -const RoomID kWSC39 = 37; -const RoomID kWSC40 = 38; -const RoomID kWSC41 = 39; -const RoomID kWSC42 = 40; -const RoomID kWSC43 = 41; -const RoomID kWSC44 = 42; -const RoomID kWSC45 = 43; -const RoomID kWSC46 = 44; -const RoomID kWSC47 = 45; -const RoomID kWSC48 = 46; -const RoomID kWSC49 = 47; -const RoomID kWSC50 = 48; -const RoomID kWSC52 = 49; -const RoomID kWSC53 = 50; -const RoomID kWSC54 = 51; -const RoomID kWSC55 = 52; -const RoomID kWSC56 = 53; -const RoomID kWSC57 = 54; -const RoomID kWSC58 = 55; -const RoomID kWSC60 = 56; -const RoomID kWSC60East = 57; -const RoomID kWSC60North = 58; -const RoomID kWSC61 = 59; -const RoomID kWSC61South = 60; -const RoomID kWSC61West = 61; -const RoomID kWSC63 = 63; -const RoomID kWSC64 = 64; -const RoomID kWSC65 = 65; -const RoomID kWSC65Screen = 66; -const RoomID kWSC66 = 67; -const RoomID kWSC67 = 68; -const RoomID kWSC68 = 69; -const RoomID kWSC69 = 70; -const RoomID kWSC70 = 71; -const RoomID kWSC71 = 72; -const RoomID kWSC72 = 73; -const RoomID kWSC73 = 74; -const RoomID kWSC74 = 75; -const RoomID kWSC75 = 76; -const RoomID kWSC0Z = 77; -const RoomID kWSC76 = 78; -const RoomID kWSC77 = 79; -const RoomID kWSC78 = 80; -const RoomID kWSC79 = 81; -const RoomID kWSC80 = 82; -const RoomID kWSC81 = 83; -const RoomID kWSC82 = 84; -const RoomID kWSC83 = 85; -const RoomID kWSC84 = 86; -const RoomID kWSC85 = 87; -const RoomID kWSC86 = 88; -const RoomID kWSC87 = 89; -const RoomID kWSC88 = 90; -const RoomID kWSC89 = 91; -const RoomID kWSC90 = 92; -const RoomID kWSC91 = 93; -const RoomID kWSC92 = 94; -const RoomID kWSC93 = 95; -const RoomID kWSC94 = 96; -const RoomID kWSC95 = 97; -const RoomID kWSC96 = 98; -const RoomID kWSC97 = 99; -const RoomID kWSC98 = 100; -const RoomID kWSCDeathRoom = 101; +static const RoomID kWSC02 = 1; +static const RoomID kWSC03 = 4; +static const RoomID kWSC04 = 5; +static const RoomID kWSC06 = 6; +static const RoomID kWSC07 = 7; +static const RoomID kWSC08 = 8; +static const RoomID kWSC09 = 9; +static const RoomID kWSC10 = 10; +static const RoomID kWSC11 = 11; +static const RoomID kWSC13 = 12; +static const RoomID kWSC14 = 13; +static const RoomID kWSC15 = 14; +static const RoomID kWSC16 = 15; +static const RoomID kWSC17 = 16; +static const RoomID kWSC18 = 17; +static const RoomID kWSC19 = 18; +static const RoomID kWSC20 = 19; +static const RoomID kWSC21 = 20; +static const RoomID kWSC22 = 21; +static const RoomID kWSC23 = 22; +static const RoomID kWSC24 = 23; +static const RoomID kWSC25 = 24; +static const RoomID kWSC26 = 25; +static const RoomID kWSC27 = 26; +static const RoomID kWSC28 = 27; +static const RoomID kWSC29 = 28; +static const RoomID kWSC31 = 29; +static const RoomID kWSC32 = 30; +static const RoomID kWSC33 = 31; +static const RoomID kWSC34 = 32; +static const RoomID kWSC35 = 33; +static const RoomID kWSC36 = 34; +static const RoomID kWSC37 = 35; +static const RoomID kWSC38 = 36; +static const RoomID kWSC39 = 37; +static const RoomID kWSC40 = 38; +static const RoomID kWSC41 = 39; +static const RoomID kWSC42 = 40; +static const RoomID kWSC43 = 41; +static const RoomID kWSC44 = 42; +static const RoomID kWSC45 = 43; +static const RoomID kWSC46 = 44; +static const RoomID kWSC47 = 45; +static const RoomID kWSC48 = 46; +static const RoomID kWSC49 = 47; +static const RoomID kWSC50 = 48; +static const RoomID kWSC52 = 49; +static const RoomID kWSC53 = 50; +static const RoomID kWSC54 = 51; +static const RoomID kWSC55 = 52; +static const RoomID kWSC56 = 53; +static const RoomID kWSC57 = 54; +static const RoomID kWSC58 = 55; +static const RoomID kWSC60 = 56; +static const RoomID kWSC60East = 57; +static const RoomID kWSC60North = 58; +static const RoomID kWSC61 = 59; +static const RoomID kWSC61South = 60; +static const RoomID kWSC61West = 61; +static const RoomID kWSC63 = 63; +static const RoomID kWSC64 = 64; +static const RoomID kWSC65 = 65; +static const RoomID kWSC65Screen = 66; +static const RoomID kWSC66 = 67; +static const RoomID kWSC67 = 68; +static const RoomID kWSC68 = 69; +static const RoomID kWSC69 = 70; +static const RoomID kWSC70 = 71; +static const RoomID kWSC71 = 72; +static const RoomID kWSC72 = 73; +static const RoomID kWSC73 = 74; +static const RoomID kWSC74 = 75; +static const RoomID kWSC75 = 76; +static const RoomID kWSC0Z = 77; +static const RoomID kWSC76 = 78; +static const RoomID kWSC77 = 79; +static const RoomID kWSC78 = 80; +static const RoomID kWSC79 = 81; +static const RoomID kWSC80 = 82; +static const RoomID kWSC81 = 83; +static const RoomID kWSC82 = 84; +static const RoomID kWSC83 = 85; +static const RoomID kWSC84 = 86; +static const RoomID kWSC85 = 87; +static const RoomID kWSC86 = 88; +static const RoomID kWSC87 = 89; +static const RoomID kWSC88 = 90; +static const RoomID kWSC89 = 91; +static const RoomID kWSC90 = 92; +static const RoomID kWSC91 = 93; +static const RoomID kWSC92 = 94; +static const RoomID kWSC93 = 95; +static const RoomID kWSC94 = 96; +static const RoomID kWSC95 = 97; +static const RoomID kWSC96 = 98; +static const RoomID kWSC97 = 99; +static const RoomID kWSC98 = 100; +static const RoomID kWSCDeathRoom = 101; // Hot Spot Activation IDs. -const HotSpotActivationID kActivationZoomedInToAnalyzer = 1; -const HotSpotActivationID kActivationShotByRobot = 2; -const HotSpotActivationID kActivationWarnedAboutPoison = 3; -const HotSpotActivationID kActivationMorphScreenOff = 4; -const HotSpotActivationID kActivationReadyForMorph = 5; -const HotSpotActivationID kActivationMorphLooping = 6; -const HotSpotActivationID kActivationMorphInterrupted = 7; -const HotSpotActivationID kActivationW03NorthOff = 8; -const HotSpotActivationID kActivationW03NorthReadyForInstructions = 9; -const HotSpotActivationID kActivationW03NorthSawInstructions = 10; -const HotSpotActivationID kActivationW03NorthInGame = 11; -const HotSpotActivationID kActivationReadyForSynthesis = 12; -const HotSpotActivationID kActivationSynthesizerLooping = 13; -const HotSpotActivationID kActivationReadyForMap = 14; -const HotSpotActivationID kActivationSinclairOfficeLocked = 15; -const HotSpotActivationID kActivationW58SouthDoorLocked = 16; -const HotSpotActivationID kActivationW61SouthOff = 17; -const HotSpotActivationID kActivationW61SouthOn = 18; -const HotSpotActivationID kActivationW61MessagesOff = 19; -const HotSpotActivationID kActivationW61MessagesOn = 20; -const HotSpotActivationID kActivationWSCRobotHeadOpen = 21; -const HotSpotActivationID kActivationRobotTurning = 22; -const HotSpotActivationID kActivationRobotDead = 23; -const HotSpotActivationID kActivationRobotGone = 24; +static const HotSpotActivationID kActivationZoomedInToAnalyzer = 1; +static const HotSpotActivationID kActivationShotByRobot = 2; +static const HotSpotActivationID kActivationWarnedAboutPoison = 3; +static const HotSpotActivationID kActivationMorphScreenOff = 4; +static const HotSpotActivationID kActivationReadyForMorph = 5; +static const HotSpotActivationID kActivationMorphLooping = 6; +static const HotSpotActivationID kActivationMorphInterrupted = 7; +static const HotSpotActivationID kActivationW03NorthOff = 8; +static const HotSpotActivationID kActivationW03NorthReadyForInstructions = 9; +static const HotSpotActivationID kActivationW03NorthSawInstructions = 10; +static const HotSpotActivationID kActivationW03NorthInGame = 11; +static const HotSpotActivationID kActivationReadyForSynthesis = 12; +static const HotSpotActivationID kActivationSynthesizerLooping = 13; +static const HotSpotActivationID kActivationReadyForMap = 14; +static const HotSpotActivationID kActivationSinclairOfficeLocked = 15; +static const HotSpotActivationID kActivationW58SouthDoorLocked = 16; +static const HotSpotActivationID kActivationW61SouthOff = 17; +static const HotSpotActivationID kActivationW61SouthOn = 18; +static const HotSpotActivationID kActivationW61MessagesOff = 19; +static const HotSpotActivationID kActivationW61MessagesOn = 20; +static const HotSpotActivationID kActivationWSCRobotHeadOpen = 21; +static const HotSpotActivationID kActivationRobotTurning = 22; +static const HotSpotActivationID kActivationRobotDead = 23; +static const HotSpotActivationID kActivationRobotGone = 24; // Hot Spot IDs. -const HotSpotID kWSCDropDartSpotID = 5000; -const HotSpotID kWSCTurnOnAnalyzerSpotID = 5001; -const HotSpotID kWSCAnalyzerScreenSpotID = 5002; -const HotSpotID kWSCSpinRobotSpotID = 5003; -const HotSpotID kWSC01YesSpotID = 5004; -const HotSpotID kWSC01NoSpotID = 5005; -const HotSpotID kWSC01AcknowledgeWarningSpotID = 5006; -const HotSpotID kWSC02SouthMorphSpotID = 5007; -const HotSpotID kWSC02SouthMessagesSpotID = 5008; -const HotSpotID kWSC02SouthMorphOutSpotID = 5009; -const HotSpotID kWSC02ActivateMorphScreenSpotID = 5010; -const HotSpotID kWSC02SouthStartMorphSpotID = 5011; -const HotSpotID kWSC02SouthInterruptMorphSpotID = 5012; -const HotSpotID kWSC02SouthMorphFinishedSpotID = 5013; -const HotSpotID kWSC02SouthTakeArgonSpotID = 5014; -const HotSpotID kWSC02SouthMessagesOutSpotID = 5015; -const HotSpotID kWSC02SouthTakeNitrogenSpotID = 5016; -const HotSpotID kWSC02SouthPlayMessagesSpotID = 5017; -const HotSpotID kWSC03NorthActivateScreenSpotID = 5018; -const HotSpotID kWSC03NorthBuildMoleculeSpotID = 5019; -const HotSpotID kWSC03NorthProceedSpotID = 5020; -const HotSpotID kWSC03NorthMolecule1SpotID = 5021; -const HotSpotID kWSC03NorthMolecule2SpotID = 5022; -const HotSpotID kWSC03NorthMolecule3SpotID = 5023; -const HotSpotID kWSC03NorthMolecule4SpotID = 5024; -const HotSpotID kWSC03NorthMolecule5SpotID = 5025; -const HotSpotID kWSC03NorthMolecule6SpotID = 5026; -const HotSpotID kWSC03SouthActivateSynthesizerSpotID = 5027; -const HotSpotID kWSC03SouthPickUpAntidoteSpotID = 5028; -const HotSpotID kWSC07SouthMapSpotID = 5029; -const HotSpotID kW42EastUnlockDoorSpotID = 5030; -const HotSpotID kW56NorthMapSpotID = 5031; -const HotSpotID kW58SouthPryDoorSpotID = 5032; -const HotSpotID kWSC60EastSpotID = 5033; -const HotSpotID kWSC60NorthSpotID = 5034; -const HotSpotID kWSC60EastOutSpotID = 5035; -const HotSpotID kWSC60NorthOutSpotID = 5036; -const HotSpotID kWSC61EastSpotID = 5037; -const HotSpotID kWSC61SouthSpotID = 5038; -const HotSpotID kW61SouthMachineGunSpotID = 5039; -const HotSpotID kW61SouthDropMachineGunSpotID = 5040; -const HotSpotID kWSC61WestSpotID = 5041; -const HotSpotID kWSC61SouthOutSpotID = 5042; -const HotSpotID kW61SouthActivateSpotID = 5043; -const HotSpotID kW61SmartAlloysSpotID = 5044; -const HotSpotID kW61MorphingSpotID = 5045; -const HotSpotID kW61TimeBendingSpotID = 5046; -const HotSpotID kWSC61WestOutSpotID = 5047; -const HotSpotID kW61TurnOnMessagesSpotID = 5048; -const HotSpotID kW61WhiteMessageSpotID = 5049; -const HotSpotID kW61WalchekMessageSpotID = 5050; -const HotSpotID kWSC65SouthScreenSpotID = 5051; -const HotSpotID kWSC65SouthScreenOutSpotID = 5052; -const HotSpotID kW98RetinalChipSpotID = 5053; -const HotSpotID kW98MapChipSpotID = 5054; -const HotSpotID kW98OpticalChipSpotID = 5055; -const HotSpotID kW98DropArgonSpotID = 5056; -const HotSpotID kW98GrabCableSpotID = 5057; -const HotSpotID kW98OpenRobotSpotID = 5058; -const HotSpotID kW98StunGunSpotID = 5059; +static const HotSpotID kWSCDropDartSpotID = 5000; +static const HotSpotID kWSCTurnOnAnalyzerSpotID = 5001; +static const HotSpotID kWSCAnalyzerScreenSpotID = 5002; +static const HotSpotID kWSCSpinRobotSpotID = 5003; +static const HotSpotID kWSC01YesSpotID = 5004; +static const HotSpotID kWSC01NoSpotID = 5005; +static const HotSpotID kWSC01AcknowledgeWarningSpotID = 5006; +static const HotSpotID kWSC02SouthMorphSpotID = 5007; +static const HotSpotID kWSC02SouthMessagesSpotID = 5008; +static const HotSpotID kWSC02SouthMorphOutSpotID = 5009; +static const HotSpotID kWSC02ActivateMorphScreenSpotID = 5010; +static const HotSpotID kWSC02SouthStartMorphSpotID = 5011; +static const HotSpotID kWSC02SouthInterruptMorphSpotID = 5012; +static const HotSpotID kWSC02SouthMorphFinishedSpotID = 5013; +static const HotSpotID kWSC02SouthTakeArgonSpotID = 5014; +static const HotSpotID kWSC02SouthMessagesOutSpotID = 5015; +static const HotSpotID kWSC02SouthTakeNitrogenSpotID = 5016; +static const HotSpotID kWSC02SouthPlayMessagesSpotID = 5017; +static const HotSpotID kWSC03NorthActivateScreenSpotID = 5018; +static const HotSpotID kWSC03NorthBuildMoleculeSpotID = 5019; +static const HotSpotID kWSC03NorthProceedSpotID = 5020; +static const HotSpotID kWSC03NorthMolecule1SpotID = 5021; +static const HotSpotID kWSC03NorthMolecule2SpotID = 5022; +static const HotSpotID kWSC03NorthMolecule3SpotID = 5023; +static const HotSpotID kWSC03NorthMolecule4SpotID = 5024; +static const HotSpotID kWSC03NorthMolecule5SpotID = 5025; +static const HotSpotID kWSC03NorthMolecule6SpotID = 5026; +static const HotSpotID kWSC03SouthActivateSynthesizerSpotID = 5027; +static const HotSpotID kWSC03SouthPickUpAntidoteSpotID = 5028; +static const HotSpotID kWSC07SouthMapSpotID = 5029; +static const HotSpotID kW42EastUnlockDoorSpotID = 5030; +static const HotSpotID kW56NorthMapSpotID = 5031; +static const HotSpotID kW58SouthPryDoorSpotID = 5032; +static const HotSpotID kWSC60EastSpotID = 5033; +static const HotSpotID kWSC60NorthSpotID = 5034; +static const HotSpotID kWSC60EastOutSpotID = 5035; +static const HotSpotID kWSC60NorthOutSpotID = 5036; +static const HotSpotID kWSC61EastSpotID = 5037; +static const HotSpotID kWSC61SouthSpotID = 5038; +static const HotSpotID kW61SouthMachineGunSpotID = 5039; +static const HotSpotID kW61SouthDropMachineGunSpotID = 5040; +static const HotSpotID kWSC61WestSpotID = 5041; +static const HotSpotID kWSC61SouthOutSpotID = 5042; +static const HotSpotID kW61SouthActivateSpotID = 5043; +static const HotSpotID kW61SmartAlloysSpotID = 5044; +static const HotSpotID kW61MorphingSpotID = 5045; +static const HotSpotID kW61TimeBendingSpotID = 5046; +static const HotSpotID kWSC61WestOutSpotID = 5047; +static const HotSpotID kW61TurnOnMessagesSpotID = 5048; +static const HotSpotID kW61WhiteMessageSpotID = 5049; +static const HotSpotID kW61WalchekMessageSpotID = 5050; +static const HotSpotID kWSC65SouthScreenSpotID = 5051; +static const HotSpotID kWSC65SouthScreenOutSpotID = 5052; +static const HotSpotID kW98RetinalChipSpotID = 5053; +static const HotSpotID kW98MapChipSpotID = 5054; +static const HotSpotID kW98OpticalChipSpotID = 5055; +static const HotSpotID kW98DropArgonSpotID = 5056; +static const HotSpotID kW98GrabCableSpotID = 5057; +static const HotSpotID kW98OpenRobotSpotID = 5058; +static const HotSpotID kW98StunGunSpotID = 5059; // Extra sequence IDs. -const ExtraID kWSCArrivalFromTSA = 0; -const ExtraID kWSCShotByRobot = 1; -const ExtraID kWSCDartScan1 = 2; -const ExtraID kWSCDartScan2 = 3; -const ExtraID kWSCDartScanNo = 4; -const ExtraID kWSCDartScan3 = 5; -const ExtraID kWSCAnalyzerPowerUp = 6; -const ExtraID kWSCAnalyzerPowerUpWithDart = 7; -const ExtraID kWSCDropDartIntoAnalyzer = 8; -const ExtraID kWSCAnalyzeDart = 9; -const ExtraID kWSCZoomOutFromAnalyzer = 10; -const ExtraID kWSCSpinRobot = 11; -const ExtraID kWSC02MorphZoomNoArgon = 12; -const ExtraID kWSC02MessagesZoomNoNitrogen = 13; -const ExtraID kWSC02ZoomOutNoArgon = 14; -const ExtraID kWSC02TurnOnMorphScreen = 15; -const ExtraID kWSC02DropToMorphExperiment = 16; -const ExtraID kWSC02MorphLoop = 17; -const ExtraID kWSC02MorphInterruption = 18; -const ExtraID kWSC02MorphFinished = 19; -const ExtraID kWSC02TurnOffMorphScreen = 20; -const ExtraID kWSC02SouthViewNoArgon = 21; -const ExtraID kMessagesMovedToOffice = 22; -const ExtraID kMessagesOff = 23; -const ExtraID kMessagesZoomOutNoNitrogen = 24; -const ExtraID kMessagesMovedToOfficeNoNitrogen = 25; -const ExtraID kMessagesOffNoNitrogen = 26; -const ExtraID kMessagesViewNoNitrogen = 27; -const ExtraID kMessagesViewMachineOnNoNitrogen = 28; -const ExtraID kW03NorthActivate = 29; -const ExtraID kW03NorthGetData = 30; -const ExtraID kW03NorthInstructions = 31; -const ExtraID kW03NorthPrepMolecule1 = 32; -const ExtraID kW03NorthPrepMolecule2 = 33; -const ExtraID kW03NorthPrepMolecule3 = 34; -const ExtraID kW03NorthFinishSynthesis = 35; -const ExtraID kW03SouthCreateAntidote = 36; -const ExtraID kW03SouthAntidoteLoop = 37; -const ExtraID kW03SouthDeactivate = 38; -const ExtraID kW03SouthViewNoAntidote = 39; -const ExtraID kWSC07SouthMap = 40; -const ExtraID kW17WestPeopleCrossing = 41; -const ExtraID kW17WestPeopleCrossingView = 42; -const ExtraID kW21SouthPeopleCrossing = 43; -const ExtraID kW24SouthPeopleCrossing = 44; -const ExtraID kW34EastPeopleCrossing = 45; -const ExtraID kW36WestPeopleCrossing = 46; -const ExtraID kW38NorthPeopleCrossing = 47; -const ExtraID kW46SouthPeopleCrossing = 48; -const ExtraID kW49NorthPeopleCrossing = 49; -const ExtraID kW49NorthPeopleCrossingView = 50; -const ExtraID kWSC56SouthMap = 51; -const ExtraID kNerdAtTheDoor1 = 52; -const ExtraID kNerdAtTheDoor2 = 53; -const ExtraID kW61SouthZoomInNoGun = 54; -const ExtraID kW61Brochure = 55; -const ExtraID kW61SouthScreenOnWithGun = 56; -const ExtraID kW61SouthScreenOffWithGun = 57; -const ExtraID kW61SouthSmartAlloysWithGun = 58; -const ExtraID kW61SouthMorphingWithGun = 59; -const ExtraID kW61SouthTimeBendingWithGun = 60; -const ExtraID kW61SouthZoomOutNoGun = 61; -const ExtraID kW61SouthScreenOnNoGun = 62; -const ExtraID kW61SouthScreenOffNoGun = 63; -const ExtraID kW61SouthSmartAlloysNoGun = 64; -const ExtraID kW61SouthMorphingNoGun = 65; -const ExtraID kW61SouthTimeBendingNoGun = 66; -const ExtraID kW61MessagesOn = 67; -const ExtraID kW61MessagesOff = 68; -const ExtraID kW61WhiteMessage = 69; -const ExtraID kW61WalchekMessage = 70; -const ExtraID kW61WalchekEasterEgg1 = 71; -const ExtraID kW62SouthPlasmaRobotAppears = 72; -const ExtraID kW62ZoomToRobot = 73; -const ExtraID kW62ZoomOutFromRobot = 74; -const ExtraID kW62PlasmaDodgeSurvive = 75; -const ExtraID kW62PlasmaDodgeDie = 76; -const ExtraID kW65SouthSinclairLecture = 77; -const ExtraID kW73WestPeopleCrossing = 78; -const ExtraID kW73WestPeopleCrossingView = 79; -const ExtraID kW0ZSpottedByWomen = 80; -const ExtraID kW95RobotShoots = 81; -const ExtraID kW98MorphsToRobot = 82; -const ExtraID kW98RobotShoots = 83; -const ExtraID kW98RobotShocked = 84; -const ExtraID kW98RobotGassed = 85; -const ExtraID kW98RobotHeadOpensDark = 86; -const ExtraID kW98RobotHead000Dark = 87; -const ExtraID kW98RobotHead001Dark = 88; -const ExtraID kW98RobotHead010Dark = 89; -const ExtraID kW98RobotHead011Dark = 90; -const ExtraID kW98RobotHead100Dark = 91; -const ExtraID kW98RobotHead101Dark = 92; -const ExtraID kW98RobotHead110Dark = 93; -const ExtraID kW98RobotHead111Dark = 94; -const ExtraID kW98RobotHeadClosesDark = 95; -const ExtraID kW98WestViewWithGunDark = 96; -const ExtraID kW98WestViewNoGunDark = 97; -const ExtraID kW98RobotHeadOpensLight = 98; -const ExtraID kW98RobotHead000Light = 99; -const ExtraID kW98RobotHead001Light = 100; -const ExtraID kW98RobotHead010Light = 101; -const ExtraID kW98RobotHead011Light = 102; -const ExtraID kW98RobotHead100Light = 103; -const ExtraID kW98RobotHead101Light = 104; -const ExtraID kW98RobotHead110Light = 105; -const ExtraID kW98RobotHead111Light = 106; -const ExtraID kW98RobotHeadClosesLight = 107; -const ExtraID kW98WestViewWithGunLight = 108; -const ExtraID kW98WestViewNoGunLight = 109; - -const CoordType kMoleculesMovieLeft = kNavAreaLeft + 112; -const CoordType kMoleculesMovieTop = kNavAreaTop + 40; +static const ExtraID kWSCArrivalFromTSA = 0; +static const ExtraID kWSCShotByRobot = 1; +static const ExtraID kWSCDartScan1 = 2; +static const ExtraID kWSCDartScan2 = 3; +static const ExtraID kWSCDartScanNo = 4; +static const ExtraID kWSCDartScan3 = 5; +static const ExtraID kWSCAnalyzerPowerUp = 6; +static const ExtraID kWSCAnalyzerPowerUpWithDart = 7; +static const ExtraID kWSCDropDartIntoAnalyzer = 8; +static const ExtraID kWSCAnalyzeDart = 9; +static const ExtraID kWSCZoomOutFromAnalyzer = 10; +static const ExtraID kWSCSpinRobot = 11; +static const ExtraID kWSC02MorphZoomNoArgon = 12; +static const ExtraID kWSC02MessagesZoomNoNitrogen = 13; +static const ExtraID kWSC02ZoomOutNoArgon = 14; +static const ExtraID kWSC02TurnOnMorphScreen = 15; +static const ExtraID kWSC02DropToMorphExperiment = 16; +static const ExtraID kWSC02MorphLoop = 17; +static const ExtraID kWSC02MorphInterruption = 18; +static const ExtraID kWSC02MorphFinished = 19; +static const ExtraID kWSC02TurnOffMorphScreen = 20; +static const ExtraID kWSC02SouthViewNoArgon = 21; +static const ExtraID kMessagesMovedToOffice = 22; +static const ExtraID kMessagesOff = 23; +static const ExtraID kMessagesZoomOutNoNitrogen = 24; +static const ExtraID kMessagesMovedToOfficeNoNitrogen = 25; +static const ExtraID kMessagesOffNoNitrogen = 26; +static const ExtraID kMessagesViewNoNitrogen = 27; +static const ExtraID kMessagesViewMachineOnNoNitrogen = 28; +static const ExtraID kW03NorthActivate = 29; +static const ExtraID kW03NorthGetData = 30; +static const ExtraID kW03NorthInstructions = 31; +static const ExtraID kW03NorthPrepMolecule1 = 32; +static const ExtraID kW03NorthPrepMolecule2 = 33; +static const ExtraID kW03NorthPrepMolecule3 = 34; +static const ExtraID kW03NorthFinishSynthesis = 35; +static const ExtraID kW03SouthCreateAntidote = 36; +static const ExtraID kW03SouthAntidoteLoop = 37; +static const ExtraID kW03SouthDeactivate = 38; +static const ExtraID kW03SouthViewNoAntidote = 39; +static const ExtraID kWSC07SouthMap = 40; +static const ExtraID kW17WestPeopleCrossing = 41; +static const ExtraID kW17WestPeopleCrossingView = 42; +static const ExtraID kW21SouthPeopleCrossing = 43; +static const ExtraID kW24SouthPeopleCrossing = 44; +static const ExtraID kW34EastPeopleCrossing = 45; +static const ExtraID kW36WestPeopleCrossing = 46; +static const ExtraID kW38NorthPeopleCrossing = 47; +static const ExtraID kW46SouthPeopleCrossing = 48; +static const ExtraID kW49NorthPeopleCrossing = 49; +static const ExtraID kW49NorthPeopleCrossingView = 50; +static const ExtraID kWSC56SouthMap = 51; +static const ExtraID kNerdAtTheDoor1 = 52; +static const ExtraID kNerdAtTheDoor2 = 53; +static const ExtraID kW61SouthZoomInNoGun = 54; +static const ExtraID kW61Brochure = 55; +static const ExtraID kW61SouthScreenOnWithGun = 56; +static const ExtraID kW61SouthScreenOffWithGun = 57; +static const ExtraID kW61SouthSmartAlloysWithGun = 58; +static const ExtraID kW61SouthMorphingWithGun = 59; +static const ExtraID kW61SouthTimeBendingWithGun = 60; +static const ExtraID kW61SouthZoomOutNoGun = 61; +static const ExtraID kW61SouthScreenOnNoGun = 62; +static const ExtraID kW61SouthScreenOffNoGun = 63; +static const ExtraID kW61SouthSmartAlloysNoGun = 64; +static const ExtraID kW61SouthMorphingNoGun = 65; +static const ExtraID kW61SouthTimeBendingNoGun = 66; +static const ExtraID kW61MessagesOn = 67; +static const ExtraID kW61MessagesOff = 68; +static const ExtraID kW61WhiteMessage = 69; +static const ExtraID kW61WalchekMessage = 70; +static const ExtraID kW61WalchekEasterEgg1 = 71; +static const ExtraID kW62SouthPlasmaRobotAppears = 72; +static const ExtraID kW62ZoomToRobot = 73; +static const ExtraID kW62ZoomOutFromRobot = 74; +static const ExtraID kW62PlasmaDodgeSurvive = 75; +static const ExtraID kW62PlasmaDodgeDie = 76; +static const ExtraID kW65SouthSinclairLecture = 77; +static const ExtraID kW73WestPeopleCrossing = 78; +static const ExtraID kW73WestPeopleCrossingView = 79; +static const ExtraID kW0ZSpottedByWomen = 80; +static const ExtraID kW95RobotShoots = 81; +static const ExtraID kW98MorphsToRobot = 82; +static const ExtraID kW98RobotShoots = 83; +static const ExtraID kW98RobotShocked = 84; +static const ExtraID kW98RobotGassed = 85; +static const ExtraID kW98RobotHeadOpensDark = 86; +static const ExtraID kW98RobotHead000Dark = 87; +static const ExtraID kW98RobotHead001Dark = 88; +static const ExtraID kW98RobotHead010Dark = 89; +static const ExtraID kW98RobotHead011Dark = 90; +static const ExtraID kW98RobotHead100Dark = 91; +static const ExtraID kW98RobotHead101Dark = 92; +static const ExtraID kW98RobotHead110Dark = 93; +static const ExtraID kW98RobotHead111Dark = 94; +static const ExtraID kW98RobotHeadClosesDark = 95; +static const ExtraID kW98WestViewWithGunDark = 96; +static const ExtraID kW98WestViewNoGunDark = 97; +static const ExtraID kW98RobotHeadOpensLight = 98; +static const ExtraID kW98RobotHead000Light = 99; +static const ExtraID kW98RobotHead001Light = 100; +static const ExtraID kW98RobotHead010Light = 101; +static const ExtraID kW98RobotHead011Light = 102; +static const ExtraID kW98RobotHead100Light = 103; +static const ExtraID kW98RobotHead101Light = 104; +static const ExtraID kW98RobotHead110Light = 105; +static const ExtraID kW98RobotHead111Light = 106; +static const ExtraID kW98RobotHeadClosesLight = 107; +static const ExtraID kW98WestViewWithGunLight = 108; +static const ExtraID kW98WestViewNoGunLight = 109; + +static const CoordType kMoleculesMovieLeft = kNavAreaLeft + 112; +static const CoordType kMoleculesMovieTop = kNavAreaTop + 40; WSC::WSC(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "WSC", kWSCID), _moleculesMovie(kNoDisplayElement) { diff --git a/engines/pegasus/neighborhood/wsc/wsc.h b/engines/pegasus/neighborhood/wsc/wsc.h index 845b587b94..e2e931ecdc 100755 --- a/engines/pegasus/neighborhood/wsc/wsc.h +++ b/engines/pegasus/neighborhood/wsc/wsc.h @@ -31,13 +31,13 @@ namespace Pegasus { -const DisplayOrder kWSCMoleculeBinOrder = kMonitorLayer; -const DisplayOrder kWSCMoleculesMovieOrder = kWSCMoleculeBinOrder + 1; +static const DisplayOrder kWSCMoleculeBinOrder = kMonitorLayer; +static const DisplayOrder kWSCMoleculesMovieOrder = kWSCMoleculeBinOrder + 1; -const RoomID kWSC01 = 0; -const RoomID kWSC02Morph = 2; -const RoomID kWSC02Messages = 3; -const RoomID kWSC62 = 62; +static const RoomID kWSC01 = 0; +static const RoomID kWSC02Morph = 2; +static const RoomID kWSC02Messages = 3; +static const RoomID kWSC62 = 62; class WSC : public Neighborhood { public: diff --git a/engines/pegasus/scoring.h b/engines/pegasus/scoring.h index 41dcb4b9a6..efae17c955 100755 --- a/engines/pegasus/scoring.h +++ b/engines/pegasus/scoring.h @@ -34,55 +34,55 @@ namespace Pegasus { // // Scoring. -const CoordType kDeathScreenScoreLeft = 151; -const CoordType kDeathScreenScoreTop = 212; -const CoordType kDeathScreenScoreWidth = 124; -const CoordType kDeathScreenScoreHeight = 12; -const CoordType kDeathScreenScoreSkipVert = -16; +static const CoordType kDeathScreenScoreLeft = 151; +static const CoordType kDeathScreenScoreTop = 212; +static const CoordType kDeathScreenScoreWidth = 124; +static const CoordType kDeathScreenScoreHeight = 12; +static const CoordType kDeathScreenScoreSkipVert = -16; // Caldoria & TSA -const GameScoreType kSawINNScore = 5; -const GameScoreType kTookShowerScore = 2; -const GameScoreType kFixedHairScore = 2; -const GameScoreType kGotKeyCardScore = 5; -const GameScoreType kReadPaperScore = 2; -const GameScoreType kLookThroughTelescopeScore = 2; -const GameScoreType kSawCaldoriaKioskScore = 2; -const GameScoreType kGoToTSAScore = 3; +static const GameScoreType kSawINNScore = 5; +static const GameScoreType kTookShowerScore = 2; +static const GameScoreType kFixedHairScore = 2; +static const GameScoreType kGotKeyCardScore = 5; +static const GameScoreType kReadPaperScore = 2; +static const GameScoreType kLookThroughTelescopeScore = 2; +static const GameScoreType kSawCaldoriaKioskScore = 2; +static const GameScoreType kGoToTSAScore = 3; -const GameScoreType kEnterTSAScore = 2; -const GameScoreType kSawBust1Score = 2; -const GameScoreType kSawBust2Score = 2; -const GameScoreType kSawBust3Score = 2; -const GameScoreType kSawBust4Score = 2; -const GameScoreType kSawBust5Score = 2; -const GameScoreType kSawBust6Score = 2; -const GameScoreType kSawTheoryScore = 4; -const GameScoreType kSawBackgroundScore = 4; -const GameScoreType kSawProcedureScore = 4; -const GameScoreType kGotJourneymanKeyScore = 5; -const GameScoreType kGotPegasusBiochipScore = 5; -const GameScoreType kGotBiosuitScore = 5; -const GameScoreType kGoToPrehistoricScore = 5; +static const GameScoreType kEnterTSAScore = 2; +static const GameScoreType kSawBust1Score = 2; +static const GameScoreType kSawBust2Score = 2; +static const GameScoreType kSawBust3Score = 2; +static const GameScoreType kSawBust4Score = 2; +static const GameScoreType kSawBust5Score = 2; +static const GameScoreType kSawBust6Score = 2; +static const GameScoreType kSawTheoryScore = 4; +static const GameScoreType kSawBackgroundScore = 4; +static const GameScoreType kSawProcedureScore = 4; +static const GameScoreType kGotJourneymanKeyScore = 5; +static const GameScoreType kGotPegasusBiochipScore = 5; +static const GameScoreType kGotBiosuitScore = 5; +static const GameScoreType kGoToPrehistoricScore = 5; -const GameScoreType kPutLogInReaderScore = 5; -const GameScoreType kSawCaldoriaNormalScore = 2; -const GameScoreType kSawCaldoriaAlteredScore = 2; -const GameScoreType kSawNoradNormalScore = 2; -const GameScoreType kSawNoradAlteredScore = 2; -const GameScoreType kSawMarsNormalScore = 2; -const GameScoreType kSawMarsAlteredScore = 2; -const GameScoreType kSawWSCNormalScore = 2; -const GameScoreType kSawWSCAlteredScore = 2; -const GameScoreType kWentToReadyRoom2Score = 5; -const GameScoreType kWentAfterSinclairScore = 5; -const GameScoreType kUsedCardBombScore = 10; -const GameScoreType kShieldedCardBombScore = 5; -const GameScoreType kStunnedSinclairScore = 10; -const GameScoreType kDisarmedNukeScore = 10; +static const GameScoreType kPutLogInReaderScore = 5; +static const GameScoreType kSawCaldoriaNormalScore = 2; +static const GameScoreType kSawCaldoriaAlteredScore = 2; +static const GameScoreType kSawNoradNormalScore = 2; +static const GameScoreType kSawNoradAlteredScore = 2; +static const GameScoreType kSawMarsNormalScore = 2; +static const GameScoreType kSawMarsAlteredScore = 2; +static const GameScoreType kSawWSCNormalScore = 2; +static const GameScoreType kSawWSCAlteredScore = 2; +static const GameScoreType kWentToReadyRoom2Score = 5; +static const GameScoreType kWentAfterSinclairScore = 5; +static const GameScoreType kUsedCardBombScore = 10; +static const GameScoreType kShieldedCardBombScore = 5; +static const GameScoreType kStunnedSinclairScore = 10; +static const GameScoreType kDisarmedNukeScore = 10; -const GameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + +static const GameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + kTookShowerScore + kFixedHairScore + kGotKeyCardScore + @@ -115,52 +115,52 @@ const GameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + kSawWSCAlteredScore + kWentToReadyRoom2Score; -const GameScoreType kMaxCaldoriaTSAScoreAfter = kWentAfterSinclairScore + +static const GameScoreType kMaxCaldoriaTSAScoreAfter = kWentAfterSinclairScore + kUsedCardBombScore + kShieldedCardBombScore + kStunnedSinclairScore + kDisarmedNukeScore; -const GameScoreType kMaxCaldoriaTSAScore = kMaxCaldoriaTSAScoreBefore + +static const GameScoreType kMaxCaldoriaTSAScore = kMaxCaldoriaTSAScoreBefore + kMaxCaldoriaTSAScoreAfter; // Prehistoric -const GameScoreType kThrewBreakerScore = 10; -const GameScoreType kExtendedBridgeScore = 10; -const GameScoreType kGotHistoricalLogScore = 5; -const GameScoreType kFinishedPrehistoricScore = 10; +static const GameScoreType kThrewBreakerScore = 10; +static const GameScoreType kExtendedBridgeScore = 10; +static const GameScoreType kGotHistoricalLogScore = 5; +static const GameScoreType kFinishedPrehistoricScore = 10; -const GameScoreType kMaxPrehistoricScore = kThrewBreakerScore + +static const GameScoreType kMaxPrehistoricScore = kThrewBreakerScore + kExtendedBridgeScore + kGotHistoricalLogScore + kFinishedPrehistoricScore; // Mars -const GameScoreType kThrownByRobotScore = 3; -const GameScoreType kGotMarsCardScore = 5; -const GameScoreType kSawMarsKioskScore = 2; -const GameScoreType kSawTransportMapScore = 2; -const GameScoreType kGotCrowBarScore = 5; -const GameScoreType kTurnedOnTransportScore = 5; -const GameScoreType kGotOxygenMaskScore = 5; -const GameScoreType kAvoidedRobotScore = 5; -const GameScoreType kActivatedPlatformScore = 2; -const GameScoreType kUsedLiquidNitrogenScore = 3; -const GameScoreType kUsedCrowBarScore = 3; -const GameScoreType kFoundCardBombScore = 4; -const GameScoreType kDisarmedCardBombScore = 8; -const GameScoreType kGotCardBombScore = 5; -const GameScoreType kThreadedMazeScore = 5; -const GameScoreType kThreadedGearRoomScore = 2; -const GameScoreType kEnteredShuttleScore = 2; -const GameScoreType kEnteredLaunchTubeScore = 4; -const GameScoreType kStoppedRobotsShuttleScore = 10; -const GameScoreType kGotMarsOpMemChipScore = 10; -const GameScoreType kFinishedMarsScore = 10; +static const GameScoreType kThrownByRobotScore = 3; +static const GameScoreType kGotMarsCardScore = 5; +static const GameScoreType kSawMarsKioskScore = 2; +static const GameScoreType kSawTransportMapScore = 2; +static const GameScoreType kGotCrowBarScore = 5; +static const GameScoreType kTurnedOnTransportScore = 5; +static const GameScoreType kGotOxygenMaskScore = 5; +static const GameScoreType kAvoidedRobotScore = 5; +static const GameScoreType kActivatedPlatformScore = 2; +static const GameScoreType kUsedLiquidNitrogenScore = 3; +static const GameScoreType kUsedCrowBarScore = 3; +static const GameScoreType kFoundCardBombScore = 4; +static const GameScoreType kDisarmedCardBombScore = 8; +static const GameScoreType kGotCardBombScore = 5; +static const GameScoreType kThreadedMazeScore = 5; +static const GameScoreType kThreadedGearRoomScore = 2; +static const GameScoreType kEnteredShuttleScore = 2; +static const GameScoreType kEnteredLaunchTubeScore = 4; +static const GameScoreType kStoppedRobotsShuttleScore = 10; +static const GameScoreType kGotMarsOpMemChipScore = 10; +static const GameScoreType kFinishedMarsScore = 10; -const GameScoreType kMaxMarsScore = kThrownByRobotScore + +static const GameScoreType kMaxMarsScore = kThrownByRobotScore + kGotMarsCardScore + kSawMarsKioskScore + kSawTransportMapScore + @@ -184,23 +184,23 @@ const GameScoreType kMaxMarsScore = kThrownByRobotScore + // Norad -const GameScoreType kSawSecurityMonitorScore = 5; -const GameScoreType kFilledOxygenCanisterScore = 5; -const GameScoreType kFilledArgonCanisterScore = 5; -const GameScoreType kSawUnconsciousOperatorScore = 5; -const GameScoreType kWentThroughPressureDoorScore = 5; -const GameScoreType kPreppedSubScore = 5; -const GameScoreType kEnteredSubScore = 5; -const GameScoreType kExitedSubScore = 10; -const GameScoreType kSawRobotAt54NorthScore = 5; -const GameScoreType kPlayedWithClawScore = 5; -const GameScoreType kUsedRetinalChipScore = 5; -const GameScoreType kFinishedGlobeGameScore = 10; -const GameScoreType kStoppedNoradRobotScore = 10; -const GameScoreType kGotNoradOpMemChipScore = 10; -const GameScoreType kFinishedNoradScore = 10; +static const GameScoreType kSawSecurityMonitorScore = 5; +static const GameScoreType kFilledOxygenCanisterScore = 5; +static const GameScoreType kFilledArgonCanisterScore = 5; +static const GameScoreType kSawUnconsciousOperatorScore = 5; +static const GameScoreType kWentThroughPressureDoorScore = 5; +static const GameScoreType kPreppedSubScore = 5; +static const GameScoreType kEnteredSubScore = 5; +static const GameScoreType kExitedSubScore = 10; +static const GameScoreType kSawRobotAt54NorthScore = 5; +static const GameScoreType kPlayedWithClawScore = 5; +static const GameScoreType kUsedRetinalChipScore = 5; +static const GameScoreType kFinishedGlobeGameScore = 10; +static const GameScoreType kStoppedNoradRobotScore = 10; +static const GameScoreType kGotNoradOpMemChipScore = 10; +static const GameScoreType kFinishedNoradScore = 10; -const GameScoreType kMaxNoradScore = kSawSecurityMonitorScore + +static const GameScoreType kMaxNoradScore = kSawSecurityMonitorScore + kFilledOxygenCanisterScore + kFilledArgonCanisterScore + kSawUnconsciousOperatorScore + @@ -218,28 +218,28 @@ const GameScoreType kMaxNoradScore = kSawSecurityMonitorScore + // WSC -const GameScoreType kRemovedDartScore = 5; -const GameScoreType kAnalyzedDartScore = 5; -const GameScoreType kBuiltAntidoteScore = 5; -const GameScoreType kGotSinclairKeyScore = 5; -const GameScoreType kGotArgonCanisterScore = 5; -const GameScoreType kGotNitrogenCanisterScore = 5; -const GameScoreType kPlayedWithMessagesScore = 2; -const GameScoreType kSawMorphExperimentScore = 3; -const GameScoreType kEnteredSinclairOfficeScore = 2; -const GameScoreType kSawBrochureScore = 3; -const GameScoreType kSawSinclairEntry1Score = 3; -const GameScoreType kSawSinclairEntry2Score = 3; -const GameScoreType kSawSinclairEntry3Score = 3; -const GameScoreType kSawWSCDirectoryScore = 3; -const GameScoreType kUsedCrowBarInWSCScore = 5; -const GameScoreType kFinishedPlasmaDodgeScore = 10; -const GameScoreType kOpenedCatwalkScore = 3; -const GameScoreType kStoppedWSCRobotScore = 10; -const GameScoreType kGotWSCOpMemChipScore = 10; -const GameScoreType kFinishedWSCScore = 10; +static const GameScoreType kRemovedDartScore = 5; +static const GameScoreType kAnalyzedDartScore = 5; +static const GameScoreType kBuiltAntidoteScore = 5; +static const GameScoreType kGotSinclairKeyScore = 5; +static const GameScoreType kGotArgonCanisterScore = 5; +static const GameScoreType kGotNitrogenCanisterScore = 5; +static const GameScoreType kPlayedWithMessagesScore = 2; +static const GameScoreType kSawMorphExperimentScore = 3; +static const GameScoreType kEnteredSinclairOfficeScore = 2; +static const GameScoreType kSawBrochureScore = 3; +static const GameScoreType kSawSinclairEntry1Score = 3; +static const GameScoreType kSawSinclairEntry2Score = 3; +static const GameScoreType kSawSinclairEntry3Score = 3; +static const GameScoreType kSawWSCDirectoryScore = 3; +static const GameScoreType kUsedCrowBarInWSCScore = 5; +static const GameScoreType kFinishedPlasmaDodgeScore = 10; +static const GameScoreType kOpenedCatwalkScore = 3; +static const GameScoreType kStoppedWSCRobotScore = 10; +static const GameScoreType kGotWSCOpMemChipScore = 10; +static const GameScoreType kFinishedWSCScore = 10; -const GameScoreType kMaxWSCScore = kRemovedDartScore + +static const GameScoreType kMaxWSCScore = kRemovedDartScore + kAnalyzedDartScore + kBuiltAntidoteScore + kGotSinclairKeyScore + @@ -262,15 +262,15 @@ const GameScoreType kMaxWSCScore = kRemovedDartScore + // Gandhi -const GameScoreType kMarsGandhiScore = 10; -const GameScoreType kNoradGandhiScore = 10; -const GameScoreType kWSCGandhiScore = 10; +static const GameScoreType kMarsGandhiScore = 10; +static const GameScoreType kNoradGandhiScore = 10; +static const GameScoreType kWSCGandhiScore = 10; -const GameScoreType kMaxGandhiScore = kMarsGandhiScore + +static const GameScoreType kMaxGandhiScore = kMarsGandhiScore + kNoradGandhiScore + kWSCGandhiScore; -const GameScoreType kMaxTotalScore = kMaxCaldoriaTSAScore + +static const GameScoreType kMaxTotalScore = kMaxCaldoriaTSAScore + kMaxPrehistoricScore + kMaxMarsScore + kMaxNoradScore + diff --git a/engines/pegasus/transition.h b/engines/pegasus/transition.h index 8be095adf2..dcd68e4c64 100755 --- a/engines/pegasus/transition.h +++ b/engines/pegasus/transition.h @@ -50,10 +50,10 @@ private: // Transitions are faders that range over [0,1000], which makes their // "resolution" one tenth of a percent -const long kTransitionBottom = 0; -const long kTransitionTop = 1000; +static const int kTransitionBottom = 0; +static const int kTransitionTop = 1000; -const long kTransitionRange = kTransitionTop - kTransitionBottom; +static const int kTransitionRange = kTransitionTop - kTransitionBottom; class Transition : public FaderAnimation { public: |