From f72884cb7bbe594888f6d14a3e03c7839ef2c508 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Fri, 16 Dec 2011 23:24:55 -0500 Subject: PEGASUS: Cleanup some constants Added missing static qualifiers, get rid of some short/long --- engines/pegasus/neighborhood/tsa/fulltsa.cpp | 736 +++++++++++++-------------- engines/pegasus/neighborhood/tsa/fulltsa.h | 6 +- engines/pegasus/neighborhood/tsa/tinytsa.cpp | 116 ++--- engines/pegasus/neighborhood/tsa/tinytsa.h | 2 +- 4 files changed, 430 insertions(+), 430 deletions(-) (limited to 'engines/pegasus/neighborhood/tsa') 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: -- cgit v1.2.3