From 8c7ebc803383a87cf3199b12d5b3485b2685a873 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Sun, 2 Oct 2011 20:52:09 -0400 Subject: PEGASUS: Add the basic Caldoria neighborhood Does not include the end-of-game timers and sequence yet. It's currently hooked up to the full game, but does not go beyond the first frame of the wake-up sequence right now. --- engines/pegasus/neighborhood/caldoria/caldoria.h | 509 +++++++++++++++++++++++ 1 file changed, 509 insertions(+) create mode 100755 engines/pegasus/neighborhood/caldoria/caldoria.h (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h new file mode 100755 index 0000000000..f2e3775168 --- /dev/null +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -0,0 +1,509 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * Additional copyright for this file: + * Copyright (C) 1995-1997 Presto Studios, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef PEGASUS_NEIGHBORHOOD_CALDORIA_CALDORIA_H +#define PEGASUS_NEIGHBORHOOD_CALDORIA_CALDORIA_H + +#include "pegasus/neighborhood/neighborhood.h" + +namespace Pegasus { + +const TimeScale kCaldoriaMovieScale = 600; +const TimeScale kCaldoriaFramesPerSecond = 15; +const TimeScale kCaldoriaFrameDuration = 40; + +// Alternate IDs. + +const tAlternateID kAltCaldoriaNormal = 0; +const tAlternateID kAltCaldoriaRoofDoorBlown = 2; +const tAlternateID kAltCaldoriaSinclairDown = 3; + +// Room IDs. + +const tRoomID kCaldoria00 = 1; +const tRoomID kCaldoria01 = 2; +const tRoomID kCaldoria02 = 3; +const tRoomID kCaldoria03 = 4; +const tRoomID kCaldoria04 = 5; +const tRoomID kCaldoria05 = 6; +const tRoomID kCaldoria06 = 7; +const tRoomID kCaldoria07 = 8; +const tRoomID kCaldoria08 = 9; +const tRoomID kCaldoria09 = 10; +const tRoomID kCaldoria10 = 11; +const tRoomID kCaldoriaToilet = 12; +const tRoomID kCaldoria11 = 13; +const tRoomID kCaldoria12 = 14; +const tRoomID kCaldoriaVidPhone = 15; +const tRoomID kCaldoriaReplicator = 16; +const tRoomID kCaldoriaDrawers = 17; +const tRoomID kCaldoria13 = 18; +const tRoomID kCaldoria14 = 19; +const tRoomID kCaldoria15 = 20; +const tRoomID kCaldoria16 = 21; +const tRoomID kCaldoria17 = 22; +const tRoomID kCaldoria18 = 23; +const tRoomID kCaldoria19 = 24; +const tRoomID kCaldoria20 = 25; +const tRoomID kCaldoria21 = 26; +const tRoomID kCaldoria22 = 27; +const tRoomID kCaldoria23 = 28; +const tRoomID kCaldoria24 = 29; +const tRoomID kCaldoria25 = 30; +const tRoomID kCaldoria26 = 31; +const tRoomID kCaldoria27 = 32; +const tRoomID kCaldoria28 = 33; +const tRoomID kCaldoria29 = 34; +const tRoomID kCaldoria30 = 35; +const tRoomID kCaldoria31 = 36; +const tRoomID kCaldoria32 = 37; +const tRoomID kCaldoria33 = 38; +const tRoomID kCaldoria34 = 39; +const tRoomID kCaldoria35 = 40; +const tRoomID kCaldoria36 = 41; +const tRoomID kCaldoria37 = 42; +const tRoomID kCaldoria38 = 43; +const tRoomID kCaldoria39 = 44; +const tRoomID kCaldoria40 = 45; +const tRoomID kCaldoria41 = 46; +const tRoomID kCaldoriaBinoculars = 47; +const tRoomID kCaldoria42 = 48; +const tRoomID kCaldoriaKiosk = 49; +const tRoomID kCaldoria44 = 50; +const tRoomID kCaldoria45 = 51; +const tRoomID kCaldoria46 = 52; +const tRoomID kCaldoria47 = 53; +const tRoomID kCaldoria48 = 54; +const tRoomID kCaldoria49 = 55; +const tRoomID kCaldoria50 = 56; +const tRoomID kCaldoria51 = 57; +const tRoomID kCaldoria52 = 58; +const tRoomID kCaldoria53 = 59; +const tRoomID kCaldoria54 = 60; +const tRoomID kCaldoria55 = 61; +const tRoomID kCaldoria56 = 62; +const tRoomID kCaldoriaDeathRoom = 0; + +// Hot Spot Activation IDs. + +const tHotSpotActivationID kActivate4DClosed = 1; +const tHotSpotActivationID kActivate4DOpen = 2; +const tHotSpotActivationID kActivateMirrorReady = 3; +const tHotSpotActivationID kActivateStylistReady = 4; +const tHotSpotActivationID kActivateReplicatorReady = 5; +const tHotSpotActivationID kActivateOJOnThePad = 6; +const tHotSpotActivationID kActivateDrawersClosed = 7; +const tHotSpotActivationID kActivateRightOpen = 8; +const tHotSpotActivationID kActivateLeftOpen = 9; +const tHotSpotActivationID kActivateFocusedOnShip = 10; +const tHotSpotActivationID kActivateNotFocusedOnShip = 11; +const tHotSpotActivationID kActivateReadyForCard = 12; +const tHotSpotActivationID kActivateReadyToTransport = 13; +const tHotSpotActivationID kActivateRoofSlotEmpty = 14; +const tHotSpotActivationID kActivateZoomedOnSinclair = 15; + +// Hot Spot IDs. + +const tHotSpotID kCa4DEnvironOpenSpotID = 5000; +const tHotSpotID kCa4DEnvironCloseSpotID = 5001; +const tHotSpotID kCa4DVisualSpotID = 5002; +const tHotSpotID kCa4DAudioSpotID = 5003; +const tHotSpotID kCa4DChoice1SpotID = 5004; +const tHotSpotID kCa4DChoice2SpotID = 5005; +const tHotSpotID kCa4DChoice3SpotID = 5006; +const tHotSpotID kCa4DChoice4SpotID = 5007; +const tHotSpotID kCaBathroomMirrorSpotID = 5008; +const tHotSpotID kCaHairStyle1SpotID = 5009; +const tHotSpotID kCaHairStyle2SpotID = 5010; +const tHotSpotID kCaHairStyle3SpotID = 5011; +const tHotSpotID kCaShowerSpotID = 5012; +const tHotSpotID kCaBathroomToiletSpotID = 5013; +const tHotSpotID kCaldoriaVidPhoneSpotID = 5014; +const tHotSpotID kCaldoriaReplicatorSpotID = 5015; +const tHotSpotID kCaldoriaDrawersSpotID = 5016; +const tHotSpotID kCaldoriaVidPhoneOutSpotID = 5017; +const tHotSpotID kCaBedroomVidPhoneActivationSpotID = 5018; +const tHotSpotID kCaldoriaReplicatorOutSpotID = 5019; +const tHotSpotID kCaldoriaMakeOJSpotID = 5020; +const tHotSpotID kCaldoriaMakeStickyBunsSpotID = 5021; +const tHotSpotID kCaldoriaOrangeJuiceSpotID = 5022; +const tHotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023; +const tHotSpotID kCaldoriaDrawersOutSpotID = 5024; +const tHotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025; +const tHotSpotID kCaldoriaRightDrawerOpenSpotID = 5026; +const tHotSpotID kCaldoriaKeyCardSpotID = 5027; +const tHotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028; +const tHotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029; +const tHotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030; +const tHotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031; +const tHotSpotID kCaldoria20DoorbellSpotID = 5032; +const tHotSpotID kCaldoria21DoorbellSpotID = 5033; +const tHotSpotID kCaldoria26DoorbellSpotID = 5034; +const tHotSpotID kCaldoriaFourthFloorElevator1 = 5035; +const tHotSpotID kCaldoriaFourthFloorElevator2 = 5036; +const tHotSpotID kCaldoriaFourthFloorElevator3 = 5037; +const tHotSpotID kCaldoriaFourthFloorElevator4 = 5038; +const tHotSpotID kCaldoriaFourthFloorElevator5 = 5039; +const tHotSpotID kCaldoriaGroundElevator1 = 5040; +const tHotSpotID kCaldoriaGroundElevator2 = 5041; +const tHotSpotID kCaldoriaGroundElevator3 = 5042; +const tHotSpotID kCaldoriaGroundElevator4 = 5043; +const tHotSpotID kCaldoriaGroundElevator5 = 5044; +const tHotSpotID kCaldoria29DoorbellSpotID = 5045; +const tHotSpotID kCaldoria34DoorbellSpotID = 5046; +const tHotSpotID kCaldoria35DoorbellSpotID = 5047; +const tHotSpotID kCaldoriaGroundElevatorSpotID = 5048; +const tHotSpotID kCaldoriaBinocularZoomInSpotID = 5049; +const tHotSpotID kCaldoriaBinocularsOutSpotID = 5050; +const tHotSpotID kCaldoriaZoomInOnShipSpotID = 5051; +const tHotSpotID kCaldoriaKioskSpotID = 5052; +const tHotSpotID kCaldoriaKioskOutSpotID = 5053; +const tHotSpotID kCaldoriaKioskInfoSpotID = 5054; +const tHotSpotID kCaldoriaGTCardDropSpotID = 5055; +const tHotSpotID kCaldoriaGTTokyoSpotID = 5056; +const tHotSpotID kCaldoriaGTTSASpotID = 5057; +const tHotSpotID kCaldoriaGTBeachSpotID = 5058; +const tHotSpotID kCaldoriaGTOtherSpotID = 5059; +const tHotSpotID kCaldoriaRoofElevator1 = 5060; +const tHotSpotID kCaldoriaRoofElevator2 = 5061; +const tHotSpotID kCaldoriaRoofElevator3 = 5062; +const tHotSpotID kCaldoriaRoofElevator4 = 5063; +const tHotSpotID kCaldoriaRoofElevator5 = 5064; +const tHotSpotID kCaldoriaRoofElevatorSpotID = 5065; +const tHotSpotID kCaldoriaRoofDoorSpotID = 5066; +const tHotSpotID kCaldoriaRoofCardDropSpotID = 5067; +const tHotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; + +// Extra sequence IDs. + +const tExtraID kCaldoriaWakeUpView1 = 0; +const tExtraID kCaldoria00WakeUp1 = 1; +const tExtraID kCaldoria00WakeUp2 = 2; +const tExtraID kCaldoria00SitDown = 3; +const tExtraID k4DEnvironOpenToINN = 4; +const tExtraID k4DINNInterruption = 5; +const tExtraID k4DINNIntro = 6; +const tExtraID k4DINNMarkJohnson = 7; +const tExtraID k4DINNMeganLove = 8; +const tExtraID k4DINNFadeOut = 9; +const tExtraID k4DEnvironOpenFromINN = 10; +const tExtraID k4DEnvironOpen = 11; +const tExtraID k4DEnvironOpenView = 12; +const tExtraID k4DEnvironClose = 13; +const tExtraID k4DIslandLoop = 14; +const tExtraID k4DDesertLoop = 15; +const tExtraID k4DMountainLoop = 16; +const tExtraID k4DIsland1ToIsland0 = 17; +const tExtraID k4DIsland2ToIsland0 = 18; +const tExtraID k4DIsland0ToDesert0 = 19; +const tExtraID k4DIsland1ToDesert0 = 20; +const tExtraID k4DIsland2ToDesert0 = 21; +const tExtraID k4DIsland0ToMountain0 = 22; +const tExtraID k4DIsland1ToMountain0 = 23; +const tExtraID k4DIsland2ToMountain0 = 24; +const tExtraID k4DDesert0ToIsland0 = 25; +const tExtraID k4DDesert1ToIsland0 = 26; +const tExtraID k4DDesert2ToIsland0 = 27; +const tExtraID k4DDesert0ToMountain0 = 28; +const tExtraID k4DDesert1ToMountain0 = 29; +const tExtraID k4DDesert2ToMountain0 = 30; +const tExtraID k4DMountain0ToIsland0 = 31; +const tExtraID k4DMountain1ToIsland0 = 32; +const tExtraID k4DMountain2ToIsland0 = 33; +const tExtraID k4DMountain0ToDesert0 = 34; +const tExtraID k4DMountain1ToDesert0 = 35; +const tExtraID k4DMountain2ToDesert0 = 36; +const tExtraID kCaBathroomGreeting = 37; +const tExtraID kCaBathroomBodyFat = 38; +const tExtraID kCaBathroomStylistIntro = 39; +const tExtraID kCaBathroomRetrothrash = 40; +const tExtraID kCaBathroomRetrothrashReturn = 41; +const tExtraID kCaBathroomGeoWave = 42; +const tExtraID kCaBathroomGeoWaveReturn = 43; +const tExtraID kCaBathroomAgencyStandard = 44; +const tExtraID kCaldoriaShowerTitle = 45; +const tExtraID kCaldoriaShowerButton = 46; +const tExtraID kCaldoriaShowerDown = 47; +const tExtraID kCaldoriaShowerUp = 48; +const tExtraID kCaBedroomVidPhone = 49; +const tExtraID kCaBedroomMessage1 = 50; +const tExtraID kCaBedroomMessage2 = 51; +const tExtraID kCreateOrangeJuice = 52; +const tExtraID kDisposeOrangeJuice = 53; +const tExtraID kReplicatorNorthViewWithOJ = 54; +const tExtraID kLeftDrawerOpen = 55; +const tExtraID kLeftDrawerClose = 56; +const tExtraID kRightDrawerOpenWithKeys = 57; +const tExtraID kRightDrawerCloseWithKeys = 58; +const tExtraID kRightDrawerOpenNoKeys = 59; +const tExtraID kRightDrawerCloseNoKeys = 60; +const tExtraID kRightDrawerOpenViewWithKeys = 61; +const tExtraID kRightDrawerOpenViewNoKeys = 62; +const tExtraID kCaldoria16ElevatorUp = 63; +const tExtraID kCaldoria16ElevatorDown = 64; +const tExtraID kCaldoria16SouthViewWithElevator = 65; +const tExtraID kCaldoria20Doorbell = 66; +const tExtraID kCaldoria21Doorbell = 67; +const tExtraID kCaldoria26Doorbell = 68; +const tExtraID kCaldoriaFourthToGround = 69; +const tExtraID kCaldoriaRoofToFourth = 70; +const tExtraID kCaldoriaRoofToGround = 71; +const tExtraID kCaldoriaGroundToFourth = 72; +const tExtraID kCaldoriaGroundToRoof = 73; +const tExtraID kCaldoriaFourthToRoof = 74; +const tExtraID kCaldoria29Doorbell = 75; +const tExtraID kCaldoria34Doorbell = 76; +const tExtraID kCaldoria35Doorbell = 77; +const tExtraID kBinocularsZoomInOnShip = 78; +const tExtraID kCaldoriaKioskVideo = 79; +const tExtraID kCaldoriaTransporterArrowLoop = 80; +const tExtraID kArriveAtCaldoriaFromTSA = 81; +const tExtraID kCaGTOtherChoice = 82; +const tExtraID kCaGTCardSwipe = 83; +const tExtraID kCaGTSelectTSA = 84; +const tExtraID kCaGTFryTheFly = 85; +const tExtraID kCaGTGoToTSA = 86; +const tExtraID kCaGTSelectBeach = 87; +const tExtraID kCaGTGoToBeach = 88; +const tExtraID kCaGTArriveAtBeach = 89; +const tExtraID kCaGTSelectTokyo = 90; +const tExtraID kCaGTGoToTokyo = 91; +const tExtraID kCaGTArriveAtTokyo = 92; +const tExtraID kCa48NorthRooftopClosed = 93; +const tExtraID kCa48NorthExplosion = 94; +const tExtraID kCa48NorthExplosionDeath = 95; +const tExtraID kCa49NorthVoiceAnalysis = 96; +const tExtraID kCa50SinclairShoots = 97; +const tExtraID kCa53EastZoomToSinclair = 98; +const tExtraID kCa53EastDeath2 = 99; +const tExtraID kCa53EastShootSinclair = 100; +const tExtraID kCa53EastZoomOutFromSinclair = 101; +const tExtraID kCa54SouthDeath = 102; +const tExtraID kCaldoria56BombStage1 = 103; +const tExtraID kCaldoria56BombStage2 = 104; +const tExtraID kCaldoria56BombStage3 = 105; +const tExtraID kCaldoria56BombStage4 = 106; +const tExtraID kCaldoria56BombStage5 = 107; +const tExtraID kCaldoria56BombStage6 = 108; +const tExtraID kCaldoria56BombStage7 = 109; +const tExtraID kCaldoria56BombExplodes = 110; + +// Caldoria interactions. + +const tInteractionID kCaldoria4DInteractionID = 0; +const tInteractionID kCaldoriaBombInteractionID = 1; +const tInteractionID kCaldoriaMessagesInteractionID = 2; +const tInteractionID kCaldoriaMirrorInteractionID = 3; + +// Caldoria: + +const tDisplayOrder kVidPhoneOrder = kMonitorLayer; +const tDisplayOrder k4DSpritesOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaMessagesOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaElevatorOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaBombGridOrder = kMonitorLayer; +const tDisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; + +///////////////////////////////////////////// +// +// Caldoria + +const tCoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; +const tCoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; + +const tCoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10; +const tCoordType kCaldoria4DSpritesTop = kNavAreaTop + 142; + +const tCoordType kCaldoriaMessageLeft = kNavAreaLeft + 202; +const tCoordType kCaldoriaMessageTop = kNavAreaTop + 26; + +const tCoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407; +const tCoordType kCaldoriaElevatorTop = kNavAreaTop + 138; + +const tCoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213; +const tCoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215; + +const tCoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414; +const tCoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215; + +const tCoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276; +const tCoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115; + +const tCoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135; +const tCoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214; + +const tCoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209; +const tCoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170; + +const tCoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480; +const tCoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191; + +const tCoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248; +const tCoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191; + +const tCoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337; +const tCoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205; + +const tCoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290; +const tCoordType kCaldoriaBombGridTop = kNavAreaTop + 58; + +const tCoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; +const tCoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; + +// Caldoria display IDs. + +const tDisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; +const tDisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; +const tDisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1; +const tDisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1; +const tDisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1; +const tDisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1; + +const TimeValue kCaldoria4DBlankChoiceIn = 29730; +const TimeValue kCaldoria4DBlankChoiceOut = 33910; + +class Caldoria : public Neighborhood { +friend void doorBombTimerExpiredFunction(FunctionPtr *, void *); +friend void sinclairTimerExpiredFunction(FunctionPtr *, void *); + +public: + Caldoria(InputHandler *, PegasusEngine *); + virtual ~Caldoria(); + + virtual uint16 getDateResID() const; + + void pickedUpItem(Item *); + + virtual GameInteraction *makeInteraction(const tInteractionID); + + virtual Common::String getBriefingMovie(); + virtual Common::String getEnvScanMovie(); + virtual uint getNumHints(); + virtual Common::String getHintMovie(uint); + void loadAmbientLoops(); + bool wantsCursor(); + void flushGameState(); + + void checkContinuePoint(const tRoomID, const tDirectionConstant); + +protected: + enum { + kCaldoriaPrivate4DSystemOpenFlag, + kCaloriaPrivateLeftDrawerOpenFlag, + kCaldoriaPrivateRightDrawerOpenFlag, + kCaldoriaPrivateReadyToShootFlag, + kCaldoriaPrivateZoomingToBombFlag, + kCaldoriaPrivateCanOpenElevatorDoorFlag, + kCaldoriaPrivateSinclairTimerExpiredFlag, + kCaldoriaPrivateSeen13CarFlag, + kCaldoriaPrivateSeen14CarFlag, + kCaldoriaPrivateSeen18CarFlag, + kCaldoriaPrivateSeen23CarFlag, + kCaldoriaPrivateSeen33CarFlag, + kCaldoriaPrivateSeen36CarFlag, + kCaldoriaPrivateSeen41NorthCarFlag, + kCaldoriaPrivateSeen41EastCarFlag, + kCaldoriaPrivateSeen41WestCarFlag, + kNumCaldoriaPrivateFlags + }; + + void init(); + void start(); + + void setUpRoofTop(); + + void setUpAIRules(); + void doAIRecalibration(); + TimeValue getViewTime(const tRoomID, const tDirectionConstant); + void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); + void startSpotOnceOnly(TimeValue, TimeValue); + void startExitMovie(const ExitTable::Entry &); + void startZoomMovie(const ZoomTable::Entry &); + void startDoorOpenMovie(const TimeValue, const TimeValue); + void startTurnPush(const tTurnDirection, const TimeValue, const tDirectionConstant); + void bumpIntoWall(); + int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &); + void getZoomCompassMove(const ZoomTable::Entry &, FaderMoveSpec &); + void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &); + void spotCompleted(); + void arriveAt(const tRoomID, const tDirectionConstant); + void arriveAtCaldoria00(); + void arriveAtCaldoriaToilet(); + void arriveAtCaldoria44(); + void arriveAtCaldoria49(); + void arriveAtCaldoria56(); + void arriveAtCaldoriaDeath(); + void turnTo(const tDirectionConstant); + void zoomTo(const Hotspot *); + void downButton(const Input &); + void receiveNotification(Notification *, const tNotificationFlags); + tInputBits getInputFilter(); + void activateHotspots(); + void clickInHotspot(const Input &, const Hotspot *); + void newInteraction(const tInteractionID); + + void clickOnDoorbell(const tHotSpotID); + + Hotspot *getItemScreenSpot(Item *, DisplayElement *); + void dropItemIntoRoom(Item *, Hotspot *); + void takeElevator(uint, uint); + void updateElevatorMovie(); + void openElevatorMovie(); + void emptyOJGlass(); + void closeDoorOffScreen(const tRoomID, const tDirectionConstant); + void doorBombTimerExpired(); + void sinclairTimerExpired(); + void checkSinclairShootsOS(); + void setUpSinclairLoops(); + void zoomToSinclair(); + void playEndMessage(); + void checkInterruptSinclair(); + + tCanOpenDoorReason canOpenDoor(DoorTable::Entry &); + void doorOpened(); + + void updateCursor(const Common::Point, const Hotspot *); + + FlagsArray _privateFlags; + + const Hotspot *_zoomOutSpot; + + FuseFunction _utilityFuse; + + long _sinclairLoopCount; + long _numSinclairLoops; + + Sprite *_gunSprite; + + Common::String getSoundSpotsName(); + Common::String getNavMovieName(); +}; + +} // End of namespace Pegasus + +#endif -- cgit v1.2.3 From 9c1fbbd1c2b63e4a610f39dac57366c227161908 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Mon, 12 Dec 2011 15:27:48 -0500 Subject: PEGASUS: Implement shooting Sinclair --- engines/pegasus/neighborhood/caldoria/caldoria.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index f2e3775168..538eaafc01 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -386,7 +386,21 @@ const tDisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1; const TimeValue kCaldoria4DBlankChoiceIn = 29730; const TimeValue kCaldoria4DBlankChoiceOut = 33910; +class Caldoria; + +class SinclairCallBack : public TimeBaseCallBack { +public: + SinclairCallBack(Caldoria *); + ~SinclairCallBack() {} + +protected: + virtual void callBack(); + + Caldoria *_caldoria; +}; + class Caldoria : public Neighborhood { +friend class SinclairCallBack; friend void doorBombTimerExpiredFunction(FunctionPtr *, void *); friend void sinclairTimerExpiredFunction(FunctionPtr *, void *); @@ -500,6 +514,8 @@ protected: Sprite *_gunSprite; + SinclairCallBack _sinclairInterrupt; + Common::String getSoundSpotsName(); Common::String getNavMovieName(); }; -- cgit v1.2.3 From 12efb47b536d2f663c9cde2739a1fd40599da669 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Fri, 16 Dec 2011 14:17:50 -0500 Subject: PEGASUS: Remove t prefix from typedefs Some other minor cleanup too --- engines/pegasus/neighborhood/caldoria/caldoria.h | 642 +++++++++++------------ 1 file changed, 321 insertions(+), 321 deletions(-) (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index 538eaafc01..c1e2a2c29d 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -36,352 +36,352 @@ const TimeScale kCaldoriaFrameDuration = 40; // Alternate IDs. -const tAlternateID kAltCaldoriaNormal = 0; -const tAlternateID kAltCaldoriaRoofDoorBlown = 2; -const tAlternateID kAltCaldoriaSinclairDown = 3; +const AlternateID kAltCaldoriaNormal = 0; +const AlternateID kAltCaldoriaRoofDoorBlown = 2; +const AlternateID kAltCaldoriaSinclairDown = 3; // Room IDs. -const tRoomID kCaldoria00 = 1; -const tRoomID kCaldoria01 = 2; -const tRoomID kCaldoria02 = 3; -const tRoomID kCaldoria03 = 4; -const tRoomID kCaldoria04 = 5; -const tRoomID kCaldoria05 = 6; -const tRoomID kCaldoria06 = 7; -const tRoomID kCaldoria07 = 8; -const tRoomID kCaldoria08 = 9; -const tRoomID kCaldoria09 = 10; -const tRoomID kCaldoria10 = 11; -const tRoomID kCaldoriaToilet = 12; -const tRoomID kCaldoria11 = 13; -const tRoomID kCaldoria12 = 14; -const tRoomID kCaldoriaVidPhone = 15; -const tRoomID kCaldoriaReplicator = 16; -const tRoomID kCaldoriaDrawers = 17; -const tRoomID kCaldoria13 = 18; -const tRoomID kCaldoria14 = 19; -const tRoomID kCaldoria15 = 20; -const tRoomID kCaldoria16 = 21; -const tRoomID kCaldoria17 = 22; -const tRoomID kCaldoria18 = 23; -const tRoomID kCaldoria19 = 24; -const tRoomID kCaldoria20 = 25; -const tRoomID kCaldoria21 = 26; -const tRoomID kCaldoria22 = 27; -const tRoomID kCaldoria23 = 28; -const tRoomID kCaldoria24 = 29; -const tRoomID kCaldoria25 = 30; -const tRoomID kCaldoria26 = 31; -const tRoomID kCaldoria27 = 32; -const tRoomID kCaldoria28 = 33; -const tRoomID kCaldoria29 = 34; -const tRoomID kCaldoria30 = 35; -const tRoomID kCaldoria31 = 36; -const tRoomID kCaldoria32 = 37; -const tRoomID kCaldoria33 = 38; -const tRoomID kCaldoria34 = 39; -const tRoomID kCaldoria35 = 40; -const tRoomID kCaldoria36 = 41; -const tRoomID kCaldoria37 = 42; -const tRoomID kCaldoria38 = 43; -const tRoomID kCaldoria39 = 44; -const tRoomID kCaldoria40 = 45; -const tRoomID kCaldoria41 = 46; -const tRoomID kCaldoriaBinoculars = 47; -const tRoomID kCaldoria42 = 48; -const tRoomID kCaldoriaKiosk = 49; -const tRoomID kCaldoria44 = 50; -const tRoomID kCaldoria45 = 51; -const tRoomID kCaldoria46 = 52; -const tRoomID kCaldoria47 = 53; -const tRoomID kCaldoria48 = 54; -const tRoomID kCaldoria49 = 55; -const tRoomID kCaldoria50 = 56; -const tRoomID kCaldoria51 = 57; -const tRoomID kCaldoria52 = 58; -const tRoomID kCaldoria53 = 59; -const tRoomID kCaldoria54 = 60; -const tRoomID kCaldoria55 = 61; -const tRoomID kCaldoria56 = 62; -const tRoomID kCaldoriaDeathRoom = 0; +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; // Hot Spot Activation IDs. -const tHotSpotActivationID kActivate4DClosed = 1; -const tHotSpotActivationID kActivate4DOpen = 2; -const tHotSpotActivationID kActivateMirrorReady = 3; -const tHotSpotActivationID kActivateStylistReady = 4; -const tHotSpotActivationID kActivateReplicatorReady = 5; -const tHotSpotActivationID kActivateOJOnThePad = 6; -const tHotSpotActivationID kActivateDrawersClosed = 7; -const tHotSpotActivationID kActivateRightOpen = 8; -const tHotSpotActivationID kActivateLeftOpen = 9; -const tHotSpotActivationID kActivateFocusedOnShip = 10; -const tHotSpotActivationID kActivateNotFocusedOnShip = 11; -const tHotSpotActivationID kActivateReadyForCard = 12; -const tHotSpotActivationID kActivateReadyToTransport = 13; -const tHotSpotActivationID kActivateRoofSlotEmpty = 14; -const tHotSpotActivationID kActivateZoomedOnSinclair = 15; +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; // Hot Spot IDs. -const tHotSpotID kCa4DEnvironOpenSpotID = 5000; -const tHotSpotID kCa4DEnvironCloseSpotID = 5001; -const tHotSpotID kCa4DVisualSpotID = 5002; -const tHotSpotID kCa4DAudioSpotID = 5003; -const tHotSpotID kCa4DChoice1SpotID = 5004; -const tHotSpotID kCa4DChoice2SpotID = 5005; -const tHotSpotID kCa4DChoice3SpotID = 5006; -const tHotSpotID kCa4DChoice4SpotID = 5007; -const tHotSpotID kCaBathroomMirrorSpotID = 5008; -const tHotSpotID kCaHairStyle1SpotID = 5009; -const tHotSpotID kCaHairStyle2SpotID = 5010; -const tHotSpotID kCaHairStyle3SpotID = 5011; -const tHotSpotID kCaShowerSpotID = 5012; -const tHotSpotID kCaBathroomToiletSpotID = 5013; -const tHotSpotID kCaldoriaVidPhoneSpotID = 5014; -const tHotSpotID kCaldoriaReplicatorSpotID = 5015; -const tHotSpotID kCaldoriaDrawersSpotID = 5016; -const tHotSpotID kCaldoriaVidPhoneOutSpotID = 5017; -const tHotSpotID kCaBedroomVidPhoneActivationSpotID = 5018; -const tHotSpotID kCaldoriaReplicatorOutSpotID = 5019; -const tHotSpotID kCaldoriaMakeOJSpotID = 5020; -const tHotSpotID kCaldoriaMakeStickyBunsSpotID = 5021; -const tHotSpotID kCaldoriaOrangeJuiceSpotID = 5022; -const tHotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023; -const tHotSpotID kCaldoriaDrawersOutSpotID = 5024; -const tHotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025; -const tHotSpotID kCaldoriaRightDrawerOpenSpotID = 5026; -const tHotSpotID kCaldoriaKeyCardSpotID = 5027; -const tHotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028; -const tHotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029; -const tHotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030; -const tHotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031; -const tHotSpotID kCaldoria20DoorbellSpotID = 5032; -const tHotSpotID kCaldoria21DoorbellSpotID = 5033; -const tHotSpotID kCaldoria26DoorbellSpotID = 5034; -const tHotSpotID kCaldoriaFourthFloorElevator1 = 5035; -const tHotSpotID kCaldoriaFourthFloorElevator2 = 5036; -const tHotSpotID kCaldoriaFourthFloorElevator3 = 5037; -const tHotSpotID kCaldoriaFourthFloorElevator4 = 5038; -const tHotSpotID kCaldoriaFourthFloorElevator5 = 5039; -const tHotSpotID kCaldoriaGroundElevator1 = 5040; -const tHotSpotID kCaldoriaGroundElevator2 = 5041; -const tHotSpotID kCaldoriaGroundElevator3 = 5042; -const tHotSpotID kCaldoriaGroundElevator4 = 5043; -const tHotSpotID kCaldoriaGroundElevator5 = 5044; -const tHotSpotID kCaldoria29DoorbellSpotID = 5045; -const tHotSpotID kCaldoria34DoorbellSpotID = 5046; -const tHotSpotID kCaldoria35DoorbellSpotID = 5047; -const tHotSpotID kCaldoriaGroundElevatorSpotID = 5048; -const tHotSpotID kCaldoriaBinocularZoomInSpotID = 5049; -const tHotSpotID kCaldoriaBinocularsOutSpotID = 5050; -const tHotSpotID kCaldoriaZoomInOnShipSpotID = 5051; -const tHotSpotID kCaldoriaKioskSpotID = 5052; -const tHotSpotID kCaldoriaKioskOutSpotID = 5053; -const tHotSpotID kCaldoriaKioskInfoSpotID = 5054; -const tHotSpotID kCaldoriaGTCardDropSpotID = 5055; -const tHotSpotID kCaldoriaGTTokyoSpotID = 5056; -const tHotSpotID kCaldoriaGTTSASpotID = 5057; -const tHotSpotID kCaldoriaGTBeachSpotID = 5058; -const tHotSpotID kCaldoriaGTOtherSpotID = 5059; -const tHotSpotID kCaldoriaRoofElevator1 = 5060; -const tHotSpotID kCaldoriaRoofElevator2 = 5061; -const tHotSpotID kCaldoriaRoofElevator3 = 5062; -const tHotSpotID kCaldoriaRoofElevator4 = 5063; -const tHotSpotID kCaldoriaRoofElevator5 = 5064; -const tHotSpotID kCaldoriaRoofElevatorSpotID = 5065; -const tHotSpotID kCaldoriaRoofDoorSpotID = 5066; -const tHotSpotID kCaldoriaRoofCardDropSpotID = 5067; -const tHotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; +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; // Extra sequence IDs. -const tExtraID kCaldoriaWakeUpView1 = 0; -const tExtraID kCaldoria00WakeUp1 = 1; -const tExtraID kCaldoria00WakeUp2 = 2; -const tExtraID kCaldoria00SitDown = 3; -const tExtraID k4DEnvironOpenToINN = 4; -const tExtraID k4DINNInterruption = 5; -const tExtraID k4DINNIntro = 6; -const tExtraID k4DINNMarkJohnson = 7; -const tExtraID k4DINNMeganLove = 8; -const tExtraID k4DINNFadeOut = 9; -const tExtraID k4DEnvironOpenFromINN = 10; -const tExtraID k4DEnvironOpen = 11; -const tExtraID k4DEnvironOpenView = 12; -const tExtraID k4DEnvironClose = 13; -const tExtraID k4DIslandLoop = 14; -const tExtraID k4DDesertLoop = 15; -const tExtraID k4DMountainLoop = 16; -const tExtraID k4DIsland1ToIsland0 = 17; -const tExtraID k4DIsland2ToIsland0 = 18; -const tExtraID k4DIsland0ToDesert0 = 19; -const tExtraID k4DIsland1ToDesert0 = 20; -const tExtraID k4DIsland2ToDesert0 = 21; -const tExtraID k4DIsland0ToMountain0 = 22; -const tExtraID k4DIsland1ToMountain0 = 23; -const tExtraID k4DIsland2ToMountain0 = 24; -const tExtraID k4DDesert0ToIsland0 = 25; -const tExtraID k4DDesert1ToIsland0 = 26; -const tExtraID k4DDesert2ToIsland0 = 27; -const tExtraID k4DDesert0ToMountain0 = 28; -const tExtraID k4DDesert1ToMountain0 = 29; -const tExtraID k4DDesert2ToMountain0 = 30; -const tExtraID k4DMountain0ToIsland0 = 31; -const tExtraID k4DMountain1ToIsland0 = 32; -const tExtraID k4DMountain2ToIsland0 = 33; -const tExtraID k4DMountain0ToDesert0 = 34; -const tExtraID k4DMountain1ToDesert0 = 35; -const tExtraID k4DMountain2ToDesert0 = 36; -const tExtraID kCaBathroomGreeting = 37; -const tExtraID kCaBathroomBodyFat = 38; -const tExtraID kCaBathroomStylistIntro = 39; -const tExtraID kCaBathroomRetrothrash = 40; -const tExtraID kCaBathroomRetrothrashReturn = 41; -const tExtraID kCaBathroomGeoWave = 42; -const tExtraID kCaBathroomGeoWaveReturn = 43; -const tExtraID kCaBathroomAgencyStandard = 44; -const tExtraID kCaldoriaShowerTitle = 45; -const tExtraID kCaldoriaShowerButton = 46; -const tExtraID kCaldoriaShowerDown = 47; -const tExtraID kCaldoriaShowerUp = 48; -const tExtraID kCaBedroomVidPhone = 49; -const tExtraID kCaBedroomMessage1 = 50; -const tExtraID kCaBedroomMessage2 = 51; -const tExtraID kCreateOrangeJuice = 52; -const tExtraID kDisposeOrangeJuice = 53; -const tExtraID kReplicatorNorthViewWithOJ = 54; -const tExtraID kLeftDrawerOpen = 55; -const tExtraID kLeftDrawerClose = 56; -const tExtraID kRightDrawerOpenWithKeys = 57; -const tExtraID kRightDrawerCloseWithKeys = 58; -const tExtraID kRightDrawerOpenNoKeys = 59; -const tExtraID kRightDrawerCloseNoKeys = 60; -const tExtraID kRightDrawerOpenViewWithKeys = 61; -const tExtraID kRightDrawerOpenViewNoKeys = 62; -const tExtraID kCaldoria16ElevatorUp = 63; -const tExtraID kCaldoria16ElevatorDown = 64; -const tExtraID kCaldoria16SouthViewWithElevator = 65; -const tExtraID kCaldoria20Doorbell = 66; -const tExtraID kCaldoria21Doorbell = 67; -const tExtraID kCaldoria26Doorbell = 68; -const tExtraID kCaldoriaFourthToGround = 69; -const tExtraID kCaldoriaRoofToFourth = 70; -const tExtraID kCaldoriaRoofToGround = 71; -const tExtraID kCaldoriaGroundToFourth = 72; -const tExtraID kCaldoriaGroundToRoof = 73; -const tExtraID kCaldoriaFourthToRoof = 74; -const tExtraID kCaldoria29Doorbell = 75; -const tExtraID kCaldoria34Doorbell = 76; -const tExtraID kCaldoria35Doorbell = 77; -const tExtraID kBinocularsZoomInOnShip = 78; -const tExtraID kCaldoriaKioskVideo = 79; -const tExtraID kCaldoriaTransporterArrowLoop = 80; -const tExtraID kArriveAtCaldoriaFromTSA = 81; -const tExtraID kCaGTOtherChoice = 82; -const tExtraID kCaGTCardSwipe = 83; -const tExtraID kCaGTSelectTSA = 84; -const tExtraID kCaGTFryTheFly = 85; -const tExtraID kCaGTGoToTSA = 86; -const tExtraID kCaGTSelectBeach = 87; -const tExtraID kCaGTGoToBeach = 88; -const tExtraID kCaGTArriveAtBeach = 89; -const tExtraID kCaGTSelectTokyo = 90; -const tExtraID kCaGTGoToTokyo = 91; -const tExtraID kCaGTArriveAtTokyo = 92; -const tExtraID kCa48NorthRooftopClosed = 93; -const tExtraID kCa48NorthExplosion = 94; -const tExtraID kCa48NorthExplosionDeath = 95; -const tExtraID kCa49NorthVoiceAnalysis = 96; -const tExtraID kCa50SinclairShoots = 97; -const tExtraID kCa53EastZoomToSinclair = 98; -const tExtraID kCa53EastDeath2 = 99; -const tExtraID kCa53EastShootSinclair = 100; -const tExtraID kCa53EastZoomOutFromSinclair = 101; -const tExtraID kCa54SouthDeath = 102; -const tExtraID kCaldoria56BombStage1 = 103; -const tExtraID kCaldoria56BombStage2 = 104; -const tExtraID kCaldoria56BombStage3 = 105; -const tExtraID kCaldoria56BombStage4 = 106; -const tExtraID kCaldoria56BombStage5 = 107; -const tExtraID kCaldoria56BombStage6 = 108; -const tExtraID kCaldoria56BombStage7 = 109; -const tExtraID kCaldoria56BombExplodes = 110; +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; // Caldoria interactions. -const tInteractionID kCaldoria4DInteractionID = 0; -const tInteractionID kCaldoriaBombInteractionID = 1; -const tInteractionID kCaldoriaMessagesInteractionID = 2; -const tInteractionID kCaldoriaMirrorInteractionID = 3; +const InteractionID kCaldoria4DInteractionID = 0; +const InteractionID kCaldoriaBombInteractionID = 1; +const InteractionID kCaldoriaMessagesInteractionID = 2; +const InteractionID kCaldoriaMirrorInteractionID = 3; // Caldoria: -const tDisplayOrder kVidPhoneOrder = kMonitorLayer; -const tDisplayOrder k4DSpritesOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaMessagesOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaElevatorOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaBombGridOrder = kMonitorLayer; -const tDisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; +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; ///////////////////////////////////////////// // // Caldoria -const tCoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; -const tCoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; +const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; +const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; -const tCoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10; -const tCoordType kCaldoria4DSpritesTop = kNavAreaTop + 142; +const CoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10; +const CoordType kCaldoria4DSpritesTop = kNavAreaTop + 142; -const tCoordType kCaldoriaMessageLeft = kNavAreaLeft + 202; -const tCoordType kCaldoriaMessageTop = kNavAreaTop + 26; +const CoordType kCaldoriaMessageLeft = kNavAreaLeft + 202; +const CoordType kCaldoriaMessageTop = kNavAreaTop + 26; -const tCoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407; -const tCoordType kCaldoriaElevatorTop = kNavAreaTop + 138; +const CoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407; +const CoordType kCaldoriaElevatorTop = kNavAreaTop + 138; -const tCoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213; -const tCoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215; +const CoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213; +const CoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215; -const tCoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414; -const tCoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215; +const CoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414; +const CoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215; -const tCoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276; -const tCoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115; +const CoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276; +const CoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115; -const tCoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135; -const tCoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214; +const CoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135; +const CoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214; -const tCoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209; -const tCoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170; +const CoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209; +const CoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170; -const tCoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480; -const tCoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191; +const CoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480; +const CoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191; -const tCoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248; -const tCoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191; +const CoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248; +const CoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191; -const tCoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337; -const tCoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205; +const CoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337; +const CoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205; -const tCoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290; -const tCoordType kCaldoriaBombGridTop = kNavAreaTop + 58; +const CoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290; +const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58; -const tCoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; -const tCoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; +const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; +const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; // Caldoria display IDs. -const tDisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; -const tDisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; -const tDisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1; -const tDisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1; -const tDisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1; -const tDisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1; +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; const TimeValue kCaldoria4DBlankChoiceIn = 29730; const TimeValue kCaldoria4DBlankChoiceOut = 33910; @@ -412,7 +412,7 @@ public: void pickedUpItem(Item *); - virtual GameInteraction *makeInteraction(const tInteractionID); + virtual GameInteraction *makeInteraction(const InteractionID); virtual Common::String getBriefingMovie(); virtual Common::String getEnvScanMovie(); @@ -422,7 +422,7 @@ public: bool wantsCursor(); void flushGameState(); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); protected: enum { @@ -452,36 +452,36 @@ protected: void setUpAIRules(); void doAIRecalibration(); - TimeValue getViewTime(const tRoomID, const tDirectionConstant); - void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); + TimeValue getViewTime(const RoomID, const DirectionConstant); + void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); void startSpotOnceOnly(TimeValue, TimeValue); void startExitMovie(const ExitTable::Entry &); void startZoomMovie(const ZoomTable::Entry &); void startDoorOpenMovie(const TimeValue, const TimeValue); - void startTurnPush(const tTurnDirection, const TimeValue, const tDirectionConstant); + void startTurnPush(const TurnDirection, const TimeValue, const DirectionConstant); void bumpIntoWall(); - int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + int16 getStaticCompassAngle(const RoomID, const DirectionConstant); void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &); void getZoomCompassMove(const ZoomTable::Entry &, FaderMoveSpec &); void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &); void spotCompleted(); - void arriveAt(const tRoomID, const tDirectionConstant); + void arriveAt(const RoomID, const DirectionConstant); void arriveAtCaldoria00(); void arriveAtCaldoriaToilet(); void arriveAtCaldoria44(); void arriveAtCaldoria49(); void arriveAtCaldoria56(); void arriveAtCaldoriaDeath(); - void turnTo(const tDirectionConstant); + void turnTo(const DirectionConstant); void zoomTo(const Hotspot *); void downButton(const Input &); - void receiveNotification(Notification *, const tNotificationFlags); - tInputBits getInputFilter(); + void receiveNotification(Notification *, const NotificationFlags); + InputBits getInputFilter(); void activateHotspots(); void clickInHotspot(const Input &, const Hotspot *); - void newInteraction(const tInteractionID); + void newInteraction(const InteractionID); - void clickOnDoorbell(const tHotSpotID); + void clickOnDoorbell(const HotSpotID); Hotspot *getItemScreenSpot(Item *, DisplayElement *); void dropItemIntoRoom(Item *, Hotspot *); @@ -489,7 +489,7 @@ protected: void updateElevatorMovie(); void openElevatorMovie(); void emptyOJGlass(); - void closeDoorOffScreen(const tRoomID, const tDirectionConstant); + void closeDoorOffScreen(const RoomID, const DirectionConstant); void doorBombTimerExpired(); void sinclairTimerExpired(); void checkSinclairShootsOS(); @@ -498,7 +498,7 @@ protected: void playEndMessage(); void checkInterruptSinclair(); - tCanOpenDoorReason canOpenDoor(DoorTable::Entry &); + CanOpenDoorReason canOpenDoor(DoorTable::Entry &); void doorOpened(); void updateCursor(const Common::Point, const Hotspot *); -- cgit v1.2.3 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/caldoria/caldoria.h | 624 +++++++++++------------ 1 file changed, 312 insertions(+), 312 deletions(-) (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') 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; -- cgit v1.2.3 From a600dcb56a9633ebfae0d726480352b6f2e9b3ba Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 20 Dec 2011 18:26:25 -0500 Subject: PEGASUS: Some space/misc cleanup --- engines/pegasus/neighborhood/caldoria/caldoria.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index 64e566e95a..f02101ec3b 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -34,13 +34,13 @@ static const TimeScale kCaldoriaMovieScale = 600; static const TimeScale kCaldoriaFramesPerSecond = 15; static const TimeScale kCaldoriaFrameDuration = 40; -// Alternate IDs. +// Alternate IDs. static const AlternateID kAltCaldoriaNormal = 0; static const AlternateID kAltCaldoriaRoofDoorBlown = 2; static const AlternateID kAltCaldoriaSinclairDown = 3; -// Room IDs. +// Room IDs. static const RoomID kCaldoria00 = 1; static const RoomID kCaldoria01 = 2; @@ -106,7 +106,7 @@ static const RoomID kCaldoria55 = 61; static const RoomID kCaldoria56 = 62; static const RoomID kCaldoriaDeathRoom = 0; -// Hot Spot Activation IDs. +// Hot Spot Activation IDs. static const HotSpotActivationID kActivate4DClosed = 1; static const HotSpotActivationID kActivate4DOpen = 2; @@ -124,7 +124,7 @@ static const HotSpotActivationID kActivateReadyToTransport = 13; static const HotSpotActivationID kActivateRoofSlotEmpty = 14; static const HotSpotActivationID kActivateZoomedOnSinclair = 15; -// Hot Spot IDs. +// Hot Spot IDs. static const HotSpotID kCa4DEnvironOpenSpotID = 5000; static const HotSpotID kCa4DEnvironCloseSpotID = 5001; @@ -196,7 +196,7 @@ static const HotSpotID kCaldoriaRoofDoorSpotID = 5066; static const HotSpotID kCaldoriaRoofCardDropSpotID = 5067; static const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; -// Extra sequence IDs. +// Extra sequence IDs. static const ExtraID kCaldoriaWakeUpView1 = 0; static const ExtraID kCaldoria00WakeUp1 = 1; @@ -310,14 +310,14 @@ static const ExtraID kCaldoria56BombStage6 = 108; static const ExtraID kCaldoria56BombStage7 = 109; static const ExtraID kCaldoria56BombExplodes = 110; -// Caldoria interactions. +// Caldoria interactions. static const InteractionID kCaldoria4DInteractionID = 0; static const InteractionID kCaldoriaBombInteractionID = 1; static const InteractionID kCaldoriaMessagesInteractionID = 2; static const InteractionID kCaldoriaMirrorInteractionID = 3; -// Caldoria: +// Caldoria: static const DisplayOrder kVidPhoneOrder = kMonitorLayer; static const DisplayOrder k4DSpritesOrder = kMonitorLayer; @@ -330,7 +330,7 @@ static const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; ///////////////////////////////////////////// // -// Caldoria +// Caldoria static const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; static const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; @@ -374,7 +374,7 @@ static const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58; static const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; static const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; -// Caldoria display IDs. +// Caldoria display IDs. static const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; static const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; -- cgit v1.2.3 From 983bd16bb78b1a6aa8872f2086dbcbca6954f2fb Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 3 Apr 2012 15:23:08 -0400 Subject: PEGASUS: Fix file permissions --- engines/pegasus/neighborhood/caldoria/caldoria.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 engines/pegasus/neighborhood/caldoria/caldoria.h (limited to 'engines/pegasus/neighborhood/caldoria/caldoria.h') diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h old mode 100755 new mode 100644 -- cgit v1.2.3