diff options
Diffstat (limited to 'engines/pegasus/neighborhood/caldoria')
4 files changed, 399 insertions, 399 deletions
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) { |