diff options
Diffstat (limited to 'engines/pegasus/neighborhood/norad')
25 files changed, 711 insertions, 718 deletions
diff --git a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp index 2af4335cc5..ff1f078b15 100755 --- a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp @@ -30,10 +30,10 @@ namespace Pegasus { -static const tNotificationFlags kECRSection1FinishedFlag = 1; -static const tNotificationFlags kECRPanFinishedFlag = kECRSection1FinishedFlag << 1; -static const tNotificationFlags kECRSection2FinishedFlag = kECRPanFinishedFlag << 1; -static const tNotificationFlags kECRNotificationFlags = kECRSection1FinishedFlag | +static const NotificationFlags kECRSection1FinishedFlag = 1; +static const NotificationFlags kECRPanFinishedFlag = kECRSection1FinishedFlag << 1; +static const NotificationFlags kECRSection2FinishedFlag = kECRPanFinishedFlag << 1; +static const NotificationFlags kECRNotificationFlags = kECRSection1FinishedFlag | kECRPanFinishedFlag | kECRSection2FinishedFlag; @@ -45,7 +45,7 @@ static const TimeValue kSection2Start = 26; static const TimeValue kSection2Stop = 1000; // Seems to be a good value for a 20 second pan. -static const tCoordType kPanPixelsPerFrame = 8; +static const CoordType kPanPixelsPerFrame = 8; // Interesting times are in seconds. static const TimeValue s_ECRInterestingTimes[] = { @@ -63,7 +63,7 @@ NoradAlphaECRMonitor::NoradAlphaECRMonitor(Neighborhood *nextHandler) : GameInte _ecrPan(kECRPanID) { } -void NoradAlphaECRMonitor::receiveNotification(Notification *, const tNotificationFlags flags) { +void NoradAlphaECRMonitor::receiveNotification(Notification *, const NotificationFlags flags) { if (flags & kECRSection1FinishedFlag) ecrSection1Finished(); else if (flags & kECRPanFinishedFlag) diff --git a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h index 329dae7310..9e286ed337 100755 --- a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h +++ b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h @@ -43,7 +43,7 @@ protected: virtual void openInteraction(); virtual void closeInteraction(); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); void ecrSection1Finished(); void ecrPanFinished(); diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp index c115f903b0..00cfe71752 100755 --- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp @@ -32,18 +32,18 @@ namespace Pegasus { -const tNotificationFlags kFSPowerUpFinishedFlag = 1; -const tNotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1; -const tNotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1; -const tNotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1; -const tNotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1; -const tNotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1; -const tNotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1; -const tNotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1; -const tNotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1; -const tNotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1; - -const tNotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag | +const NotificationFlags kFSPowerUpFinishedFlag = 1; +const NotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1; +const NotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1; +const NotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1; +const NotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1; +const NotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1; +const NotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1; +const NotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1; +const NotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1; +const NotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1; + +const NotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag | kFSSplashFinishedFlag | kFSIntakeWarningFinishedFlag | kFSIntakeHiliteFinishedFlag | @@ -61,12 +61,10 @@ const int16 kDispenseMenu = 3; const int16 kWaitingForDispense = 4; // Dummy itemIDs +const ItemID kCO2Item = 10000; +const ItemID kHeItem = 10001; -const tItemID kCO2Item = 10000; -const tItemID kHeItem = 10001; - -// Interactive points. - +// Interactive points. const TimeValue kFSPowerUpStartStart = 0; const TimeValue kFSPowerUpStartStop = 600; const TimeValue kFSSplashStart = 600; @@ -168,7 +166,7 @@ void NoradAlphaFillingStation::setStaticState(TimeValue time, int16 state) { allowInput(true); } -void NoradAlphaFillingStation::setSegmentState(TimeValue start, TimeValue stop, tNotificationFlags flag, int16 state) { +void NoradAlphaFillingStation::setSegmentState(TimeValue start, TimeValue stop, NotificationFlags flag, int16 state) { _rightSideMovie.stop(); _rightSideMovie.setSegment(start, stop); _rightSideMovie.setTime(start); @@ -316,7 +314,7 @@ void NoradAlphaFillingStation::NHighlightFinished() { dispenseGas(); } -void NoradAlphaFillingStation::receiveNotification(Notification *, const tNotificationFlags flags) { +void NoradAlphaFillingStation::receiveNotification(Notification *, const NotificationFlags flags) { switch (flags) { case kFSPowerUpFinishedFlag: powerUpFinished(); diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.h b/engines/pegasus/neighborhood/norad/alpha/fillingstation.h index e3fb1f6fd8..eb2088e373 100755 --- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.h +++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.h @@ -47,7 +47,7 @@ public: void newFillingItem(Item *); protected: - void receiveNotification(Notification *, const tNotificationFlags); + void receiveNotification(Notification *, const NotificationFlags); virtual void openInteraction(); virtual void initInteraction(); @@ -77,13 +77,13 @@ protected: void dispenseGas(); void setStaticState(TimeValue, int16); - void setSegmentState(TimeValue, TimeValue, tNotificationFlags, int16); + void setSegmentState(TimeValue, TimeValue, NotificationFlags, int16); Movie _rightSideMovie; Notification _rightSideNotification; NotificationCallBack _rightSideCallBack; int16 _state; - tItemID _dispenseItemID; + ItemID _dispenseItemID; }; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp index 3bab3b822d..8391a3ff10 100755 --- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp @@ -132,9 +132,9 @@ void NoradAlpha::start() { g_energyMonitor->startEnergyDraining(); } - tNeighborhoodID itemNeighborhood; - tRoomID itemRoom; - tDirectionConstant itemDirection; + NeighborhoodID itemNeighborhood; + RoomID itemRoom; + DirectionConstant itemDirection; Item *item = (Item *)g_allItems.findItemByID(kGasCanister); item->getItemRoom(itemNeighborhood, itemRoom, itemDirection); @@ -211,7 +211,7 @@ void NoradAlpha::playClawMonitorIntro() { playSpotSoundSync(kLoadClawIntroIn, kLoadClawIntroOut); } -GameInteraction *NoradAlpha::makeInteraction(const tInteractionID interactionID) { +GameInteraction *NoradAlpha::makeInteraction(const InteractionID interactionID) { switch (interactionID) { case kNoradECRMonitorInteractionID: return new NoradAlphaECRMonitor(this); @@ -250,7 +250,7 @@ void NoradAlpha::loadAmbientLoops() { if (!GameState.getNoradSeenTimeStream()) return; - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if (GameState.getNoradGassed()) { if (room >= kNorad11 && room <= kNorad19West) loadLoopSound1("Sounds/Norad/NEW SUB AMB.22K.AIFF", kNoradWarningVolume * 3); @@ -288,7 +288,7 @@ void NoradAlpha::loadAmbientLoops() { } -void NoradAlpha::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) { +void NoradAlpha::checkContinuePoint(const RoomID room, const DirectionConstant direction) { switch (MakeRoomView(room, direction)) { case MakeRoomView(kNorad02, kEast): case MakeRoomView(kNorad06, kEast): @@ -301,7 +301,7 @@ void NoradAlpha::checkContinuePoint(const tRoomID room, const tDirectionConstant } } -void NoradAlpha::arriveAt(const tRoomID room, const tDirectionConstant direction) { +void NoradAlpha::arriveAt(const RoomID room, const DirectionConstant direction) { Norad::arriveAt(room, direction); switch (GameState.getCurrentRoom()) { @@ -364,7 +364,7 @@ void NoradAlpha::bumpIntoWall() { Neighborhood::bumpIntoWall(); } -void NoradAlpha::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void NoradAlpha::receiveNotification(Notification *notification, const NotificationFlags flags) { if ((flags & kExtraCompletedFlag) != 0) { switch (_lastExtra) { case kNoradArriveFromTSA: @@ -400,7 +400,7 @@ void NoradAlpha::receiveNotification(Notification *notification, const tNotifica g_AIArea->checkMiddleArea(); } -void NoradAlpha::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) { +void NoradAlpha::getZoomEntry(const HotSpotID spotID, ZoomTable::Entry &entry) { Norad::getZoomEntry(spotID, entry); ExtraTable::Entry extra; @@ -428,7 +428,7 @@ void NoradAlpha::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) } } -TimeValue NoradAlpha::getViewTime(const tRoomID room, const tDirectionConstant direction) { +TimeValue NoradAlpha::getViewTime(const RoomID room, const DirectionConstant direction) { ExtraTable::Entry entry; if (room == kNorad01 && direction == kSouth && !GameState.getNoradSeenTimeStream()) { @@ -511,13 +511,13 @@ void NoradAlpha::activateHotspots() { case MakeRoomView(kNorad01West, kWest): if (_vm->getDragType() == kDragInventoryUse) { if (!_fillingStationItem) { - tItemID itemID = _vm->getDraggingItem()->getObjectID(); + ItemID itemID = _vm->getDraggingItem()->getObjectID(); if (itemID == kArgonCanister || itemID == kGasCanister || itemID == kAirMask || itemID == kNitrogenCanister) g_allHotspots.activateOneHotspot(kN01GasOutletSpotID); } } else { - tHotSpotID spotID; + HotSpotID spotID; if (_fillingStationItem) { switch (_fillingStationItem->getObjectID()) { @@ -596,9 +596,9 @@ void NoradAlpha::dropItemIntoRoom(Item *item, Hotspot *droppedSpot) { Norad::dropItemIntoRoom(item, droppedSpot); } -void NoradAlpha::getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID, - tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, - tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) { +void NoradAlpha::getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID, + HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, + HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) { outSpotID = kNorad22MonitorOutSpotID; prepSpotID = kNorad22LaunchPrepSpotID; clawControlSpotID = kNorad22ClawControlSpotID; @@ -632,7 +632,7 @@ Common::String NoradAlpha::getEnvScanMovie() { Common::String movieName = Neighborhood::getEnvScanMovie(); if (movieName.empty()) { - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if (room >= kNorad01 && room <= kNorad01West) return "Images/AI/Norad/XNE1"; else if ((room >= kNorad02 && room <= kNorad19West)) @@ -718,7 +718,7 @@ Common::String NoradAlpha::getHintMovie(uint hintNum) { return movieName; } -void NoradAlpha::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) { +void NoradAlpha::closeDoorOffScreen(const RoomID room, const DirectionConstant) { switch (room) { case kNorad12: case kNorad13: @@ -732,7 +732,7 @@ void NoradAlpha::closeDoorOffScreen(const tRoomID room, const tDirectionConstant } } -void NoradAlpha::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &spotEntry) { +void NoradAlpha::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &spotEntry) { if (room == kNorad01 && direction == kSouth) spotEntry.clear(); else diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.h b/engines/pegasus/neighborhood/norad/alpha/noradalpha.h index 9b96d136ec..b88a6eb802 100755 --- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.h +++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.h @@ -54,12 +54,12 @@ public: virtual void takeItemFromRoom(Item *); virtual void dropItemIntoRoom(Item *, Hotspot *); - virtual GameInteraction *makeInteraction(const tInteractionID); + virtual GameInteraction *makeInteraction(const InteractionID); - virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, - tHotSpotID &pinchClawSpotID, tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, - tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, tHotSpotID &clawCCWSpotID, - tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&); + virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, + HotSpotID &pinchClawSpotID, HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, + HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, HotSpotID &clawCCWSpotID, + HotSpotID &clawCWSpotID, uint32 &, const uint32 *&); void loadAmbientLoops(); @@ -71,11 +71,11 @@ public: void setSubPrepFailed(bool value) { _subPrepFailed = value; } bool getSubPrepFailed() { return _subPrepFailed; } - void closeDoorOffScreen(const tRoomID, const tDirectionConstant); - void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); + void closeDoorOffScreen(const RoomID, const DirectionConstant); + void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); void clickInHotspot(const Input &, const Hotspot *); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); bool canSolve(); void doSolve(); @@ -89,12 +89,12 @@ protected: virtual void arriveAtNorad04(); virtual void arriveAtNorad22(); - virtual void arriveAt(const tRoomID, const tDirectionConstant); + virtual void arriveAt(const RoomID, const DirectionConstant); - virtual void getZoomEntry(const tHotSpotID, ZoomTable::Entry &); - virtual TimeValue getViewTime(const tRoomID, const tDirectionConstant); + virtual void getZoomEntry(const HotSpotID, ZoomTable::Entry &); + virtual TimeValue getViewTime(const RoomID, const DirectionConstant); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); virtual void activateHotspots(); diff --git a/engines/pegasus/neighborhood/norad/alpha/panorama.cpp b/engines/pegasus/neighborhood/norad/alpha/panorama.cpp index 417305cbc2..614595ba25 100755 --- a/engines/pegasus/neighborhood/norad/alpha/panorama.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/panorama.cpp @@ -118,13 +118,13 @@ void Panorama::setViewBounds(const Common::Rect &newView) { } if (_viewBounds != r) { - tCoordType stripLeft = 0; + CoordType stripLeft = 0; if (r.width() != _viewBounds.width() || !_panoramaWorld.isSurfaceValid()) { _panoramaWorld.deallocateSurface(); makeNewSurface(r); } else { - tCoordType stripRight; + CoordType stripRight; calcStripRange(r, stripLeft, stripRight); loadStrips(stripLeft, stripRight); } @@ -159,7 +159,7 @@ void Panorama::drawPanorama(const Common::Rect &destRect) { // _panoramaHeight, _stripWidth is correct. // _panoramaMovie is allocated. void Panorama::makeNewSurface(const Common::Rect& view) { - tCoordType stripLeft, stripRight; + CoordType stripLeft, stripRight; calcStripRange(view, stripLeft, stripRight); Common::Rect r(0, 0, (stripRight - stripLeft + 1) * _stripWidth, _panoramaHeight); @@ -169,7 +169,7 @@ void Panorama::makeNewSurface(const Common::Rect& view) { } // Assumes view is not empty. -void Panorama::calcStripRange(const Common::Rect &view, tCoordType &stripLeft, tCoordType &stripRight) { +void Panorama::calcStripRange(const Common::Rect &view, CoordType &stripLeft, CoordType &stripRight) { stripLeft = view.left / _stripWidth; stripRight = (view.left - view.left % _stripWidth + _stripWidth - 1 + view.width()) / _stripWidth; } @@ -179,18 +179,18 @@ void Panorama::calcStripRange(const Common::Rect &view, tCoordType &stripLeft, t // Assumptions: // Surface is allocated and is big enough for maximum range of // stripLeft and stripRight -void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) { +void Panorama::loadStrips(CoordType stripLeft, CoordType stripRight) { if (_stripLeft == -1) { // Surface has just been allocated. // Load in all strips. - for (tCoordType i = stripLeft; i <= stripRight; i++) + for (CoordType i = stripLeft; i <= stripRight; i++) loadOneStrip(i, stripLeft); _stripLeft = stripLeft; _stripRight = stripRight; } else if (stripLeft != _stripLeft) { - tCoordType overlapLeft = MAX(stripLeft, _stripLeft); - tCoordType overlapRight = MIN(stripRight, _stripRight); + CoordType overlapLeft = MAX(stripLeft, _stripLeft); + CoordType overlapRight = MIN(stripRight, _stripRight); if (overlapLeft <= overlapRight) { Common::Rect r1((overlapLeft - _stripLeft) * _stripWidth, 0, @@ -202,18 +202,18 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) { _panoramaWorld.getSurfaceBounds(bounds); _panoramaWorld.getSurface()->move(bounds.right - r1.right, 0, _panoramaHeight); - for (tCoordType i = stripLeft; i < _stripLeft; i++) + for (CoordType i = stripLeft; i < _stripLeft; i++) loadOneStrip(i, stripLeft); } else { _panoramaWorld.getSurface()->move(-r1.left, 0, _panoramaHeight); - for (tCoordType i = _stripRight + 1; i <= stripRight; i++) + for (CoordType i = _stripRight + 1; i <= stripRight; i++) loadOneStrip(i, stripLeft); } } else { // No overlap. // Load everything. - for (tCoordType i = stripLeft; i <= stripRight; i++) + for (CoordType i = stripLeft; i <= stripRight; i++) loadOneStrip(i, stripLeft); } @@ -221,7 +221,7 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) { _stripRight = stripRight; } else if (stripRight > _stripRight) { // Need to add one or more strips. - for (tCoordType i = _stripRight + 1; i <= stripRight; i++) + for (CoordType i = _stripRight + 1; i <= stripRight; i++) loadOneStrip(i, _stripLeft); _stripRight = stripRight; @@ -231,7 +231,7 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) { } } -void Panorama::loadOneStrip(tCoordType stripToLoad, tCoordType leftStrip) { +void Panorama::loadOneStrip(CoordType stripToLoad, CoordType leftStrip) { _panoramaMovie.moveMovieBoxTo((stripToLoad - leftStrip) * _stripWidth, 0); _panoramaMovie.setTime(stripToLoad, 1); _panoramaMovie.redrawMovieWorld(); diff --git a/engines/pegasus/neighborhood/norad/alpha/panorama.h b/engines/pegasus/neighborhood/norad/alpha/panorama.h index a773da9750..3ca2c1e305 100755 --- a/engines/pegasus/neighborhood/norad/alpha/panorama.h +++ b/engines/pegasus/neighborhood/norad/alpha/panorama.h @@ -79,18 +79,18 @@ public: protected: void blankFields(); void makeNewSurface(const Common::Rect &); - void calcStripRange(const Common::Rect &, tCoordType &, tCoordType &); - void loadStrips(tCoordType, tCoordType); - void loadOneStrip(tCoordType, tCoordType); + void calcStripRange(const Common::Rect &, CoordType &, CoordType &); + void loadStrips(CoordType, CoordType); + void loadOneStrip(CoordType, CoordType); Movie _panoramaMovie; Surface _panoramaWorld, *_mask; Common::Rect _viewBounds; Common::Rect _drawBounds; - tCoordType _panoramaWidth, _panoramaHeight; - tCoordType _stripWidth; // Pixels per strip. - tCoordType _numStrips; - tCoordType _stripLeft, _stripRight; + CoordType _panoramaWidth, _panoramaHeight; + CoordType _stripWidth; // Pixels per strip. + CoordType _numStrips; + CoordType _stripLeft, _stripRight; }; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp index 2b8ff49a6a..fcb49c52ee 100755 --- a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp @@ -27,7 +27,7 @@ namespace Pegasus { -PanoramaScroll::PanoramaScroll(const tDisplayElementID id) : IdlerAnimation(id) { +PanoramaScroll::PanoramaScroll(const DisplayElementID id) : IdlerAnimation(id) { _boundsWidth = 0; _totalWidth = 0; } @@ -72,7 +72,7 @@ void PanoramaScroll::draw(const Common::Rect &) { } void PanoramaScroll::timeChanged(const TimeValue newTime) { - tCoordType leftPixel = (_totalWidth - _boundsWidth) * newTime / getDuration(); + CoordType leftPixel = (_totalWidth - _boundsWidth) * newTime / getDuration(); Common::Rect r; _panorama.getViewBounds(r); diff --git a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h index 8496181d73..6a3e1515e2 100755 --- a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h +++ b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h @@ -32,7 +32,7 @@ namespace Pegasus { class PanoramaScroll : public IdlerAnimation { public: - PanoramaScroll(const tDisplayElementID); + PanoramaScroll(const DisplayElementID); virtual ~PanoramaScroll() {} void initFromMovieFile(const Common::String &); @@ -52,7 +52,7 @@ protected: Panorama _panorama; Surface _mask; - tCoordType _totalWidth, _boundsWidth; + CoordType _totalWidth, _boundsWidth; }; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/constants.h b/engines/pegasus/neighborhood/norad/constants.h index 8d5eff4a95..92319b899d 100755 --- a/engines/pegasus/neighborhood/norad/constants.h +++ b/engines/pegasus/neighborhood/norad/constants.h @@ -196,9 +196,9 @@ const TimeValue kYouCannotPossiblyOut = 65740; const TimeValue kYouWillFailIn = 65740; const TimeValue kYouWillFailOut = 67217; -const tCanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1; +const CanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1; -const tNotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1; +const NotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1; const uint16 kNoradWarningVolume = 0x100 / 3; const uint16 kNoradSuckWindVolume = 0x100 / 2; @@ -209,237 +209,237 @@ const int16 kSubControlCompassAngle = -10; // Norad interactions. -const tInteractionID kNoradGlobeGameInteractionID = 0; -const tInteractionID kNoradECRMonitorInteractionID = 1; -const tInteractionID kNoradFillingStationInteractionID = 2; -const tInteractionID kNoradElevatorInteractionID = 3; -const tInteractionID kNoradPressureDoorInteractionID = 4; -const tInteractionID kNoradSubControlRoomInteractionID = 5; -const tInteractionID kNoradSubPlatformInteractionID = 6; +const InteractionID kNoradGlobeGameInteractionID = 0; +const InteractionID kNoradECRMonitorInteractionID = 1; +const InteractionID kNoradFillingStationInteractionID = 2; +const InteractionID kNoradElevatorInteractionID = 3; +const InteractionID kNoradPressureDoorInteractionID = 4; +const InteractionID kNoradSubControlRoomInteractionID = 5; +const InteractionID kNoradSubPlatformInteractionID = 6; ///////////////////////////////////////////// // // Norad Alpha -const tCoordType kECRSlideShowLeft = kNavAreaLeft + 78; -const tCoordType kECRSlideShowTop = kNavAreaTop + 1; +const CoordType kECRSlideShowLeft = kNavAreaLeft + 78; +const CoordType kECRSlideShowTop = kNavAreaTop + 1; -const tCoordType kECRPanLeft = kNavAreaLeft + 78 + 5; -const tCoordType kECRPanTop = kNavAreaTop + 1 + 4; -const tCoordType kECRPanRight = kECRPanLeft + 213; -const tCoordType kECRPanBottom = kECRPanTop + 241; +const CoordType kECRPanLeft = kNavAreaLeft + 78 + 5; +const CoordType kECRPanTop = kNavAreaTop + 1 + 4; +const CoordType kECRPanRight = kECRPanLeft + 213; +const CoordType kECRPanBottom = kECRPanTop + 241; -const tCoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332; -const tCoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127; +const CoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332; +const CoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127; -const tCoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0; -const tCoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0; +const CoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0; +const CoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0; -const tCoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240; -const tCoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12; +const CoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240; +const CoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12; -const tCoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98; -const tCoordType kNoradUpperLevelsTop = kNavAreaTop + 31; +const CoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98; +const CoordType kNoradUpperLevelsTop = kNavAreaTop + 31; -const tCoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114; -const tCoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8; +const CoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114; +const CoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8; -const tCoordType kNoradUpperUpLeft = kNavAreaLeft + 361; -const tCoordType kNoradUpperUpTop = kNavAreaTop + 32; +const CoordType kNoradUpperUpLeft = kNavAreaLeft + 361; +const CoordType kNoradUpperUpTop = kNavAreaTop + 32; -const tCoordType kNoradUpperDownLeft = kNavAreaLeft + 367; -const tCoordType kNoradUpperDownTop = kNavAreaTop + 66; +const CoordType kNoradUpperDownLeft = kNavAreaLeft + 367; +const CoordType kNoradUpperDownTop = kNavAreaTop + 66; -const tCoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74; -const tCoordType kNoradLowerLevelsTop = kNavAreaTop + 157; +const CoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74; +const CoordType kNoradLowerLevelsTop = kNavAreaTop + 157; -const tCoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144; -const tCoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9; +const CoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144; +const CoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9; -const tCoordType kNoradLowerUpLeft = kNavAreaLeft + 380; -const tCoordType kNoradLowerUpTop = kNavAreaTop + 164; +const CoordType kNoradLowerUpLeft = kNavAreaLeft + 380; +const CoordType kNoradLowerUpTop = kNavAreaTop + 164; -const tCoordType kNoradLowerDownLeft = kNavAreaLeft + 388; -const tCoordType kNoradLowerDownTop = kNavAreaTop + 212; +const CoordType kNoradLowerDownLeft = kNavAreaLeft + 388; +const CoordType kNoradLowerDownTop = kNavAreaTop + 212; -const tCoordType kNoradPlatformLeft = kNavAreaLeft + 36; -const tCoordType kNoradPlatformTop = kNavAreaTop + 87; +const CoordType kNoradPlatformLeft = kNavAreaLeft + 36; +const CoordType kNoradPlatformTop = kNavAreaTop + 87; -const tCoordType kNoradSubControlLeft = kNavAreaLeft + 0; -const tCoordType kNoradSubControlTop = kNavAreaTop + 84; +const CoordType kNoradSubControlLeft = kNavAreaLeft + 0; +const CoordType kNoradSubControlTop = kNavAreaTop + 84; -const tCoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106; -const tCoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86; +const CoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106; +const CoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86; -const tCoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66; -const tCoordType kNoradSubControlDownTop = kNoradSubControlTop + 106; +const CoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66; +const CoordType kNoradSubControlDownTop = kNoradSubControlTop + 106; -const tCoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83; -const tCoordType kNoradSubControlRightTop = kNoradSubControlTop + 90; +const CoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83; +const CoordType kNoradSubControlRightTop = kNoradSubControlTop + 90; -const tCoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56; -const tCoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91; +const CoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56; +const CoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91; -const tCoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66; -const tCoordType kNoradSubControlUpTop = kNoradSubControlTop + 81; +const CoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66; +const CoordType kNoradSubControlUpTop = kNoradSubControlTop + 81; -const tCoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29; -const tCoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88; +const CoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29; +const CoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88; -const tCoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0; -const tCoordType kNoradSubControlCWTop = kNoradSubControlTop + 89; +const CoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0; +const CoordType kNoradSubControlCWTop = kNoradSubControlTop + 89; -const tCoordType kNoradClawMonitorLeft = kNavAreaLeft + 288; -const tCoordType kNoradClawMonitorTop = kNavAreaTop + 97; +const CoordType kNoradClawMonitorLeft = kNavAreaLeft + 288; +const CoordType kNoradClawMonitorTop = kNavAreaTop + 97; -const tCoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179; -const tCoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82; +const CoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179; +const CoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82; -const tCoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130; -const tCoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73; +const CoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130; +const CoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73; -const tCoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110; -const tCoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26; +const CoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110; +const CoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26; -const tCoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21; -const tCoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49; +const CoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21; +const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49; ///////////////////////////////////////////// // // Norad Delta -const tCoordType kGlobeMonitorLeft = kNavAreaLeft + 360; -const tCoordType kGlobeMonitorTop = kNavAreaTop + 144; +const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360; +const CoordType kGlobeMonitorTop = kNavAreaTop + 144; -const tCoordType kGlobeLeft = kNavAreaLeft + 172; -const tCoordType kGlobeTop = kNavAreaTop; +const CoordType kGlobeLeft = kNavAreaLeft + 172; +const CoordType kGlobeTop = kNavAreaTop; -const tCoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186; -const tCoordType kGlobeCircleLeftTop = kNavAreaTop + 41; +const CoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186; +const CoordType kGlobeCircleLeftTop = kNavAreaTop + 41; -const tCoordType kGlobeCircleRightLeft = kNavAreaLeft + 321; -const tCoordType kGlobeCircleRightTop = kNavAreaTop + 41; +const CoordType kGlobeCircleRightLeft = kNavAreaLeft + 321; +const CoordType kGlobeCircleRightTop = kNavAreaTop + 41; -const tCoordType kGlobeCircleUpLeft = kNavAreaLeft + 220; -const tCoordType kGlobeCircleUpTop = kNavAreaTop + 7; +const CoordType kGlobeCircleUpLeft = kNavAreaLeft + 220; +const CoordType kGlobeCircleUpTop = kNavAreaTop + 7; -const tCoordType kGlobeCircleDownLeft = kNavAreaLeft + 220; -const tCoordType kGlobeCircleDownTop = kNavAreaTop + 142; +const CoordType kGlobeCircleDownLeft = kNavAreaLeft + 220; +const CoordType kGlobeCircleDownTop = kNavAreaTop + 142; -const tCoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207; -const tCoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28; +const CoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207; +const CoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28; -const tCoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307; -const tCoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28; +const CoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307; +const CoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28; -const tCoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207; -const tCoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128; +const CoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207; +const CoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128; -const tCoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307; -const tCoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128; +const CoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307; +const CoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128; -const tCoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182; -const tCoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60; +const CoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182; +const CoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60; -const tCoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331; -const tCoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60; +const CoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331; +const CoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60; -const tCoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239; -const tCoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3; +const CoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239; +const CoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3; -const tCoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239; -const tCoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152; +const CoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239; +const CoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152; -const tCoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368; -const tCoordType kGlobeUpperNamesTop = kNavAreaTop + 188; +const CoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368; +const CoordType kGlobeUpperNamesTop = kNavAreaTop + 188; -const tCoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368; -const tCoordType kGlobeLowerNamesTop = kNavAreaTop + 212; +const CoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368; +const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212; -const tCoordType kGlobeCountdownLeft = kNavAreaLeft + 478; -const tCoordType kGlobeCountdownTop = kNavAreaTop + 164; +const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478; +const CoordType kGlobeCountdownTop = kNavAreaTop + 164; // Norad Alpha display IDs. -const tDisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID; -const tDisplayElementID kECRPanID = kECRSlideShowMovieID + 1; -const tDisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1; -const tDisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1; -const tDisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1; -const tDisplayElementID kN01RightSideID = kN01LeftSideID + 1; -const tDisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1; -const tDisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1; -const tDisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1; -const tDisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1; -const tDisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1; -const tDisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1; -const tDisplayElementID kClawMonitorID = kSubControlMonitorID + 1; -const tDisplayElementID kSubControlPinchID = kClawMonitorID + 1; -const tDisplayElementID kSubControlDownID = kSubControlPinchID + 1; -const tDisplayElementID kSubControlRightID = kSubControlDownID + 1; -const tDisplayElementID kSubControlLeftID = kSubControlRightID + 1; -const tDisplayElementID kSubControlUpID = kSubControlLeftID + 1; -const tDisplayElementID kSubControlCCWID = kSubControlUpID + 1; -const tDisplayElementID kSubControlCWID = kSubControlCCWID + 1; -const tDisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1; +const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID; +const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1; +const DisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1; +const DisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1; +const DisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1; +const DisplayElementID kN01RightSideID = kN01LeftSideID + 1; +const DisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1; +const DisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1; +const DisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1; +const DisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1; +const DisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1; +const DisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1; +const DisplayElementID kClawMonitorID = kSubControlMonitorID + 1; +const DisplayElementID kSubControlPinchID = kClawMonitorID + 1; +const DisplayElementID kSubControlDownID = kSubControlPinchID + 1; +const DisplayElementID kSubControlRightID = kSubControlDownID + 1; +const DisplayElementID kSubControlLeftID = kSubControlRightID + 1; +const DisplayElementID kSubControlUpID = kSubControlLeftID + 1; +const DisplayElementID kSubControlCCWID = kSubControlUpID + 1; +const DisplayElementID kSubControlCWID = kSubControlCCWID + 1; +const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1; // Norad Delta display IDs. -const tDisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID; -const tDisplayElementID kGlobeMovieID = kGlobeMonitorID + 14; -const tDisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1; -const tDisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1; -const tDisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1; -const tDisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1; -const tDisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1; -const tDisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1; -const tDisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1; -const tDisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1; -const tDisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1; -const tDisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1; -const tDisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1; -const tDisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1; -const tDisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1; -const tDisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1; -const tDisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1; +const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID; +const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14; +const DisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1; +const DisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1; +const DisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1; +const DisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1; +const DisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1; +const DisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1; +const DisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1; +const DisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1; +const DisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1; +const DisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1; +const DisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1; +const DisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1; +const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1; +const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1; +const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1; // Norad Alpha: -const tDisplayOrder kECRMonitorOrder = kMonitorLayer; -const tDisplayOrder kECRPanOrder = kECRMonitorOrder + 1; +const DisplayOrder kECRMonitorOrder = kMonitorLayer; +const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1; -const tDisplayOrder kN01LeftSideOrder = kMonitorLayer; -const tDisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1; +const DisplayOrder kN01LeftSideOrder = kMonitorLayer; +const DisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1; -const tDisplayOrder kElevatorControlsOrder = kMonitorLayer; +const DisplayOrder kElevatorControlsOrder = kMonitorLayer; -const tDisplayOrder kPressureLevelsOrder = kMonitorLayer; -const tDisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1; -const tDisplayOrder kPressureUpOrder = kPressureTypeOrder + 1; -const tDisplayOrder kPressureDownOrder = kPressureUpOrder + 1; +const DisplayOrder kPressureLevelsOrder = kMonitorLayer; +const DisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1; +const DisplayOrder kPressureUpOrder = kPressureTypeOrder + 1; +const DisplayOrder kPressureDownOrder = kPressureUpOrder + 1; -const tDisplayOrder kPlatformOrder = kMonitorLayer; +const DisplayOrder kPlatformOrder = kMonitorLayer; -const tDisplayOrder kSubControlOrder = kMonitorLayer; -const tDisplayOrder kClawMonitorOrder = kSubControlOrder + 1; -const tDisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1; -const tDisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1; -const tDisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1; -const tDisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1; -const tDisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1; -const tDisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1; -const tDisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1; -const tDisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1; +const DisplayOrder kSubControlOrder = kMonitorLayer; +const DisplayOrder kClawMonitorOrder = kSubControlOrder + 1; +const DisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1; +const DisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1; +const DisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1; +const DisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1; +const DisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1; +const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1; +const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1; +const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1; // Norad Delta: -const tDisplayOrder kGlobeMonitorLayer = kMonitorLayer; -const tDisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1; -const tDisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1; -const tDisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1; -const tDisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1; -const tDisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1; -const tDisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1; +const DisplayOrder kGlobeMonitorLayer = kMonitorLayer; +const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1; +const DisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1; +const DisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1; +const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1; +const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1; +const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1; // Norad Alpha Tables @@ -449,204 +449,204 @@ const TimeScale kNoradAlphaFrameDuration = 40; // Alternate IDs. -const tAlternateID kAltNoradAlphaNormal = 0; +const AlternateID kAltNoradAlphaNormal = 0; // Room IDs. -const tRoomID kNorad01 = 0; -const tRoomID kNorad01East = 1; -const tRoomID kNorad01West = 2; -const tRoomID kNorad02 = 3; -const tRoomID kNorad03 = 4; -const tRoomID kNorad04 = 5; -const tRoomID kNorad05 = 6; -const tRoomID kNorad06 = 7; -const tRoomID kNorad07 = 8; -const tRoomID kNorad07North = 9; -const tRoomID kNorad08 = 10; -const tRoomID kNorad09 = 11; -const tRoomID kNorad10 = 12; -const tRoomID kNorad10East = 13; -const tRoomID kNorad11 = 14; -const tRoomID kNorad11South = 15; -const tRoomID kNorad12 = 16; -const tRoomID kNorad12South = 17; -const tRoomID kNorad13 = 18; -const tRoomID kNorad14 = 19; -const tRoomID kNorad15 = 20; -const tRoomID kNorad16 = 21; -const tRoomID kNorad17 = 22; -const tRoomID kNorad18 = 23; -const tRoomID kNorad19 = 24; -const tRoomID kNorad19West = 25; -const tRoomID kNorad21 = 26; -const tRoomID kNorad21West = 27; -const tRoomID kNorad22 = 28; -const tRoomID kNorad22West = 29; +const RoomID kNorad01 = 0; +const RoomID kNorad01East = 1; +const RoomID kNorad01West = 2; +const RoomID kNorad02 = 3; +const RoomID kNorad03 = 4; +const RoomID kNorad04 = 5; +const RoomID kNorad05 = 6; +const RoomID kNorad06 = 7; +const RoomID kNorad07 = 8; +const RoomID kNorad07North = 9; +const RoomID kNorad08 = 10; +const RoomID kNorad09 = 11; +const RoomID kNorad10 = 12; +const RoomID kNorad10East = 13; +const RoomID kNorad11 = 14; +const RoomID kNorad11South = 15; +const RoomID kNorad12 = 16; +const RoomID kNorad12South = 17; +const RoomID kNorad13 = 18; +const RoomID kNorad14 = 19; +const RoomID kNorad15 = 20; +const RoomID kNorad16 = 21; +const RoomID kNorad17 = 22; +const RoomID kNorad18 = 23; +const RoomID kNorad19 = 24; +const RoomID kNorad19West = 25; +const RoomID kNorad21 = 26; +const RoomID kNorad21West = 27; +const RoomID kNorad22 = 28; +const RoomID kNorad22West = 29; // Hot Spot Activation IDs. // Hot Spot IDs. -const tHotSpotID kNorad01ECRSpotID = 5000; -const tHotSpotID kNorad01GasSpotID = 5001; -const tHotSpotID kNorad01ECROutSpotID = 5002; -const tHotSpotID kNorad01GasOutSpotID = 5003; -const tHotSpotID kNorad01MonitorSpotID = 5004; -const tHotSpotID kNorad01IntakeSpotID = 5005; -const tHotSpotID kNorad01DispenseSpotID = 5006; -const tHotSpotID kNorad01ArSpotID = 5007; -const tHotSpotID kNorad01CO2SpotID = 5008; -const tHotSpotID kNorad01HeSpotID = 5009; -const tHotSpotID kNorad01OSpotID = 5010; -const tHotSpotID kNorad01NSpotID = 5011; -const tHotSpotID kN01GasCanisterSpotID = 5012; -const tHotSpotID kN01ArgonCanisterSpotID = 5013; -const tHotSpotID kN01AirMaskSpotID = 5014; -const tHotSpotID kN01NitrogenCanisterSpotID = 5015; -const tHotSpotID kN01GasOutletSpotID = 5016; -const tHotSpotID kNorad07DoorSpotID = 5017; -const tHotSpotID kNorad07DoorOutSpotID = 5018; -const tHotSpotID kNorad10DoorSpotID = 5019; -const tHotSpotID kNorad10EastOutSpotID = 5020; -const tHotSpotID kAlphaUpperPressureDoorUpSpotID = 5021; -const tHotSpotID kAlphaUpperPressureDoorDownSpotID = 5022; -const tHotSpotID kNorad11ElevatorSpotID = 5023; -const tHotSpotID kNorad11ElevatorOutSpotID = 5024; -const tHotSpotID kNorad11ElevatorDownSpotID = 5025; -const tHotSpotID kNorad12ElevatorSpotID = 5026; -const tHotSpotID kNorad12ElevatorOutSpotID = 5027; -const tHotSpotID kNorad12ElevatorUpSpotID = 5028; -const tHotSpotID kNorad19MonitorSpotID = 5029; -const tHotSpotID kNorad19MonitorOutSpotID = 5030; -const tHotSpotID kNorad19ActivateMonitorSpotID = 5031; -const tHotSpotID kNorad21WestSpotID = 5032; -const tHotSpotID kNorad21WestOutSpotID = 5033; -const tHotSpotID kAlphaLowerPressureDoorUpSpotID = 5034; -const tHotSpotID kAlphaLowerPressureDoorDownSpotID = 5035; -const tHotSpotID kNorad22MonitorSpotID = 5036; -const tHotSpotID kNorad22MonitorOutSpotID = 5037; -const tHotSpotID kNorad22LaunchPrepSpotID = 5038; -const tHotSpotID kNorad22ClawControlSpotID = 5039; -const tHotSpotID kNorad22ClawPinchSpotID = 5040; -const tHotSpotID kNorad22ClawDownSpotID = 5041; -const tHotSpotID kNorad22ClawRightSpotID = 5042; -const tHotSpotID kNorad22ClawLeftSpotID = 5043; -const tHotSpotID kNorad22ClawUpSpotID = 5044; -const tHotSpotID kNorad22ClawCCWSpotID = 5045; -const tHotSpotID kNorad22ClawCWSpotID = 5046; +const HotSpotID kNorad01ECRSpotID = 5000; +const HotSpotID kNorad01GasSpotID = 5001; +const HotSpotID kNorad01ECROutSpotID = 5002; +const HotSpotID kNorad01GasOutSpotID = 5003; +const HotSpotID kNorad01MonitorSpotID = 5004; +const HotSpotID kNorad01IntakeSpotID = 5005; +const HotSpotID kNorad01DispenseSpotID = 5006; +const HotSpotID kNorad01ArSpotID = 5007; +const HotSpotID kNorad01CO2SpotID = 5008; +const HotSpotID kNorad01HeSpotID = 5009; +const HotSpotID kNorad01OSpotID = 5010; +const HotSpotID kNorad01NSpotID = 5011; +const HotSpotID kN01GasCanisterSpotID = 5012; +const HotSpotID kN01ArgonCanisterSpotID = 5013; +const HotSpotID kN01AirMaskSpotID = 5014; +const HotSpotID kN01NitrogenCanisterSpotID = 5015; +const HotSpotID kN01GasOutletSpotID = 5016; +const HotSpotID kNorad07DoorSpotID = 5017; +const HotSpotID kNorad07DoorOutSpotID = 5018; +const HotSpotID kNorad10DoorSpotID = 5019; +const HotSpotID kNorad10EastOutSpotID = 5020; +const HotSpotID kAlphaUpperPressureDoorUpSpotID = 5021; +const HotSpotID kAlphaUpperPressureDoorDownSpotID = 5022; +const HotSpotID kNorad11ElevatorSpotID = 5023; +const HotSpotID kNorad11ElevatorOutSpotID = 5024; +const HotSpotID kNorad11ElevatorDownSpotID = 5025; +const HotSpotID kNorad12ElevatorSpotID = 5026; +const HotSpotID kNorad12ElevatorOutSpotID = 5027; +const HotSpotID kNorad12ElevatorUpSpotID = 5028; +const HotSpotID kNorad19MonitorSpotID = 5029; +const HotSpotID kNorad19MonitorOutSpotID = 5030; +const HotSpotID kNorad19ActivateMonitorSpotID = 5031; +const HotSpotID kNorad21WestSpotID = 5032; +const HotSpotID kNorad21WestOutSpotID = 5033; +const HotSpotID kAlphaLowerPressureDoorUpSpotID = 5034; +const HotSpotID kAlphaLowerPressureDoorDownSpotID = 5035; +const HotSpotID kNorad22MonitorSpotID = 5036; +const HotSpotID kNorad22MonitorOutSpotID = 5037; +const HotSpotID kNorad22LaunchPrepSpotID = 5038; +const HotSpotID kNorad22ClawControlSpotID = 5039; +const HotSpotID kNorad22ClawPinchSpotID = 5040; +const HotSpotID kNorad22ClawDownSpotID = 5041; +const HotSpotID kNorad22ClawRightSpotID = 5042; +const HotSpotID kNorad22ClawLeftSpotID = 5043; +const HotSpotID kNorad22ClawUpSpotID = 5044; +const HotSpotID kNorad22ClawCCWSpotID = 5045; +const HotSpotID kNorad22ClawCWSpotID = 5046; // Extra sequence IDs. -const tExtraID kNoradArriveFromTSA = 0; -const tExtraID kNorad01RobotTaunt = 1; -const tExtraID kNorad01ZoomInWithGasCanister = 2; -const tExtraID kN01WGasCanister = 3; -const tExtraID kNorad01ZoomOutWithGasCanister = 4; -const tExtraID kN01WZEmptyLit = 5; -const tExtraID kN01WZGasCanisterDim = 6; -const tExtraID kN01WZGasCanisterLit = 7; -const tExtraID kN01WZArgonCanisterDim = 8; -const tExtraID kN01WZArgonCanisterLit = 9; -const tExtraID kN01WZAirMaskDim = 10; -const tExtraID kN01WZAirMaskLit = 11; -const tExtraID kN01WZNitrogenCanisterDim = 12; -const tExtraID kN01WZNitrogenCanisterLit = 13; -const tExtraID kNorad04EastDeath = 14; -const tExtraID kNorad19PrepSub = 15; -const tExtraID kNorad19ExitToSub = 16; -const tExtraID kNorad22SouthIntro = 17; -const tExtraID kNorad22SouthReply = 18; -const tExtraID kNorad22SouthFinish = 19; -const tExtraID kN22ClawFromAToB = 20; -const tExtraID kN22ClawALoop = 21; -const tExtraID kN22ClawAPinch = 22; -const tExtraID kN22ClawACounterclockwise = 23; -const tExtraID kN22ClawAClockwise = 24; -const tExtraID kN22ClawFromBToA = 25; -const tExtraID kN22ClawFromBToC = 26; -const tExtraID kN22ClawFromBToD = 27; -const tExtraID kN22ClawBLoop = 28; -const tExtraID kN22ClawBPinch = 29; -const tExtraID kN22ClawBCounterclockwise = 30; -const tExtraID kN22ClawBClockwise = 31; -const tExtraID kN22ClawFromCToB = 32; -const tExtraID kN22ClawCLoop = 33; -const tExtraID kN22ClawCPinch = 34; -const tExtraID kN22ClawCCounterclockwise = 35; -const tExtraID kN22ClawCClockwise = 36; -const tExtraID kN22ClawFromDToB = 37; -const tExtraID kN22ClawDLoop = 38; -const tExtraID kN22ClawDPinch = 39; -const tExtraID kN22ClawDCounterclockwise = 40; -const tExtraID kN22ClawDClockwise = 41; +const ExtraID kNoradArriveFromTSA = 0; +const ExtraID kNorad01RobotTaunt = 1; +const ExtraID kNorad01ZoomInWithGasCanister = 2; +const ExtraID kN01WGasCanister = 3; +const ExtraID kNorad01ZoomOutWithGasCanister = 4; +const ExtraID kN01WZEmptyLit = 5; +const ExtraID kN01WZGasCanisterDim = 6; +const ExtraID kN01WZGasCanisterLit = 7; +const ExtraID kN01WZArgonCanisterDim = 8; +const ExtraID kN01WZArgonCanisterLit = 9; +const ExtraID kN01WZAirMaskDim = 10; +const ExtraID kN01WZAirMaskLit = 11; +const ExtraID kN01WZNitrogenCanisterDim = 12; +const ExtraID kN01WZNitrogenCanisterLit = 13; +const ExtraID kNorad04EastDeath = 14; +const ExtraID kNorad19PrepSub = 15; +const ExtraID kNorad19ExitToSub = 16; +const ExtraID kNorad22SouthIntro = 17; +const ExtraID kNorad22SouthReply = 18; +const ExtraID kNorad22SouthFinish = 19; +const ExtraID kN22ClawFromAToB = 20; +const ExtraID kN22ClawALoop = 21; +const ExtraID kN22ClawAPinch = 22; +const ExtraID kN22ClawACounterclockwise = 23; +const ExtraID kN22ClawAClockwise = 24; +const ExtraID kN22ClawFromBToA = 25; +const ExtraID kN22ClawFromBToC = 26; +const ExtraID kN22ClawFromBToD = 27; +const ExtraID kN22ClawBLoop = 28; +const ExtraID kN22ClawBPinch = 29; +const ExtraID kN22ClawBCounterclockwise = 30; +const ExtraID kN22ClawBClockwise = 31; +const ExtraID kN22ClawFromCToB = 32; +const ExtraID kN22ClawCLoop = 33; +const ExtraID kN22ClawCPinch = 34; +const ExtraID kN22ClawCCounterclockwise = 35; +const ExtraID kN22ClawCClockwise = 36; +const ExtraID kN22ClawFromDToB = 37; +const ExtraID kN22ClawDLoop = 38; +const ExtraID kN22ClawDPinch = 39; +const ExtraID kN22ClawDCounterclockwise = 40; +const ExtraID kN22ClawDClockwise = 41; // Norad Delta Extra sequence IDs. -const tExtraID kArriveFromSubChase = 0; -const tExtraID kN59ZoomWithRobot = 1; -const tExtraID kN59RobotApproaches = 2; -const tExtraID kN59RobotPunchLoop = 3; -const tExtraID kN59PlayerWins1 = 4; -const tExtraID kN59PlayerWins2 = 5; -const tExtraID kN59RobotWins = 6; -const tExtraID kN59RobotHeadOpens = 7; -const tExtraID kN59Biochips111 = 8; -const tExtraID kN59Biochips011 = 9; -const tExtraID kN59Biochips101 = 10; -const tExtraID kN59Biochips001 = 11; -const tExtraID kN59Biochips110 = 12; -const tExtraID kN59Biochips010 = 13; -const tExtraID kN59Biochips100 = 14; -const tExtraID kN59Biochips000 = 15; -const tExtraID kN59RobotDisappears = 16; -const tExtraID kN60ClawFromAToB = 17; -const tExtraID kN60ClawALoop = 18; -const tExtraID kN60ClawAPinch = 19; -const tExtraID kN60ClawACounterclockwise = 20; -const tExtraID kN60ClawAClockwise = 21; -const tExtraID kN60ClawFromBToA = 22; -const tExtraID kN60ClawFromBToC = 23; -const tExtraID kN60ClawFromBToD = 24; -const tExtraID kN60ClawBLoop = 25; -const tExtraID kN60ClawBPinch = 26; -const tExtraID kN60ClawBCounterclockwise = 27; -const tExtraID kN60ClawBClockwise = 28; -const tExtraID kN60ClawFromCToB = 29; -const tExtraID kN60ClawCLoop = 30; -const tExtraID kN60ClawCPinch = 31; -const tExtraID kN60ClawCCounterclockwise = 32; -const tExtraID kN60ClawCClockwise = 33; -const tExtraID kN60ClawFromDToB = 34; -const tExtraID kN60ClawDLoop = 35; -const tExtraID kN60ClawDPinch = 36; -const tExtraID kN60ClawDCounterclockwise = 37; -const tExtraID kN60ClawDClockwise = 38; -const tExtraID kN60RobotApproaches = 39; -const tExtraID kN60FirstMistake = 40; -const tExtraID kN60ArmActivated = 41; -const tExtraID kN60SecondMistake = 42; -const tExtraID kN60ArmToPositionB = 43; -const tExtraID kN60ThirdMistake = 44; -const tExtraID kN60ArmGrabsRobot = 45; -const tExtraID kN60FourthMistake = 46; -const tExtraID kN60ArmCarriesRobotToPositionA = 47; -const tExtraID kN60PlayerFollowsRobotToDoor = 48; -const tExtraID kN60RobotHeadOpens = 49; -const tExtraID kN60Biochips111 = 50; -const tExtraID kN60Biochips011 = 51; -const tExtraID kN60Biochips101 = 52; -const tExtraID kN60Biochips001 = 53; -const tExtraID kN60Biochips110 = 54; -const tExtraID kN60Biochips010 = 55; -const tExtraID kN60Biochips100 = 56; -const tExtraID kN60Biochips000 = 57; -const tExtraID kN60RobotDisappears = 58; -const tExtraID kNoradDeltaRetinalScanBad = 59; -const tExtraID kNoradDeltaRetinalScanGood = 60; -const tExtraID kN79BrightView = 61; +const ExtraID kArriveFromSubChase = 0; +const ExtraID kN59ZoomWithRobot = 1; +const ExtraID kN59RobotApproaches = 2; +const ExtraID kN59RobotPunchLoop = 3; +const ExtraID kN59PlayerWins1 = 4; +const ExtraID kN59PlayerWins2 = 5; +const ExtraID kN59RobotWins = 6; +const ExtraID kN59RobotHeadOpens = 7; +const ExtraID kN59Biochips111 = 8; +const ExtraID kN59Biochips011 = 9; +const ExtraID kN59Biochips101 = 10; +const ExtraID kN59Biochips001 = 11; +const ExtraID kN59Biochips110 = 12; +const ExtraID kN59Biochips010 = 13; +const ExtraID kN59Biochips100 = 14; +const ExtraID kN59Biochips000 = 15; +const ExtraID kN59RobotDisappears = 16; +const ExtraID kN60ClawFromAToB = 17; +const ExtraID kN60ClawALoop = 18; +const ExtraID kN60ClawAPinch = 19; +const ExtraID kN60ClawACounterclockwise = 20; +const ExtraID kN60ClawAClockwise = 21; +const ExtraID kN60ClawFromBToA = 22; +const ExtraID kN60ClawFromBToC = 23; +const ExtraID kN60ClawFromBToD = 24; +const ExtraID kN60ClawBLoop = 25; +const ExtraID kN60ClawBPinch = 26; +const ExtraID kN60ClawBCounterclockwise = 27; +const ExtraID kN60ClawBClockwise = 28; +const ExtraID kN60ClawFromCToB = 29; +const ExtraID kN60ClawCLoop = 30; +const ExtraID kN60ClawCPinch = 31; +const ExtraID kN60ClawCCounterclockwise = 32; +const ExtraID kN60ClawCClockwise = 33; +const ExtraID kN60ClawFromDToB = 34; +const ExtraID kN60ClawDLoop = 35; +const ExtraID kN60ClawDPinch = 36; +const ExtraID kN60ClawDCounterclockwise = 37; +const ExtraID kN60ClawDClockwise = 38; +const ExtraID kN60RobotApproaches = 39; +const ExtraID kN60FirstMistake = 40; +const ExtraID kN60ArmActivated = 41; +const ExtraID kN60SecondMistake = 42; +const ExtraID kN60ArmToPositionB = 43; +const ExtraID kN60ThirdMistake = 44; +const ExtraID kN60ArmGrabsRobot = 45; +const ExtraID kN60FourthMistake = 46; +const ExtraID kN60ArmCarriesRobotToPositionA = 47; +const ExtraID kN60PlayerFollowsRobotToDoor = 48; +const ExtraID kN60RobotHeadOpens = 49; +const ExtraID kN60Biochips111 = 50; +const ExtraID kN60Biochips011 = 51; +const ExtraID kN60Biochips101 = 52; +const ExtraID kN60Biochips001 = 53; +const ExtraID kN60Biochips110 = 54; +const ExtraID kN60Biochips010 = 55; +const ExtraID kN60Biochips100 = 56; +const ExtraID kN60Biochips000 = 57; +const ExtraID kN60RobotDisappears = 58; +const ExtraID kNoradDeltaRetinalScanBad = 59; +const ExtraID kNoradDeltaRetinalScanGood = 60; +const ExtraID kN79BrightView = 61; // Norad Delta Tables @@ -656,99 +656,99 @@ const TimeScale kNoradDeltaFrameDuration = 40; // Alternate IDs. -const tAlternateID kAltNoradDeltaNormal = 0; +const AlternateID kAltNoradDeltaNormal = 0; // Room IDs. -const tRoomID kNorad41 = 0; -const tRoomID kNorad42 = 1; -const tRoomID kNorad43 = 2; -const tRoomID kNorad44 = 3; -const tRoomID kNorad45 = 4; -const tRoomID kNorad46 = 5; -const tRoomID kNorad47 = 6; -const tRoomID kNorad48 = 7; -const tRoomID kNorad48South = 8; -const tRoomID kNorad49 = 9; -const tRoomID kNorad49South = 10; -const tRoomID kNorad50 = 11; -const tRoomID kNorad50East = 12; -const tRoomID kNorad51 = 13; -const tRoomID kNorad52 = 14; -const tRoomID kNorad53 = 15; -const tRoomID kNorad54 = 16; -const tRoomID kNorad54North = 17; -const tRoomID kNorad55 = 18; -const tRoomID kNorad56 = 19; -const tRoomID kNorad57 = 20; -const tRoomID kNorad58 = 21; -const tRoomID kNorad59 = 22; -const tRoomID kNorad59West = 23; -const tRoomID kNorad60 = 24; -const tRoomID kNorad60West = 25; -const tRoomID kNorad61 = 26; -const tRoomID kNorad62 = 27; -const tRoomID kNorad63 = 28; -const tRoomID kNorad64 = 29; -const tRoomID kNorad65 = 30; -const tRoomID kNorad66 = 31; -const tRoomID kNorad67 = 32; -const tRoomID kNorad68 = 33; -const tRoomID kNorad68West = 34; -const tRoomID kNorad69 = 35; -const tRoomID kNorad78 = 36; -const tRoomID kNorad79 = 37; -const tRoomID kNorad79West = 38; +const RoomID kNorad41 = 0; +const RoomID kNorad42 = 1; +const RoomID kNorad43 = 2; +const RoomID kNorad44 = 3; +const RoomID kNorad45 = 4; +const RoomID kNorad46 = 5; +const RoomID kNorad47 = 6; +const RoomID kNorad48 = 7; +const RoomID kNorad48South = 8; +const RoomID kNorad49 = 9; +const RoomID kNorad49South = 10; +const RoomID kNorad50 = 11; +const RoomID kNorad50East = 12; +const RoomID kNorad51 = 13; +const RoomID kNorad52 = 14; +const RoomID kNorad53 = 15; +const RoomID kNorad54 = 16; +const RoomID kNorad54North = 17; +const RoomID kNorad55 = 18; +const RoomID kNorad56 = 19; +const RoomID kNorad57 = 20; +const RoomID kNorad58 = 21; +const RoomID kNorad59 = 22; +const RoomID kNorad59West = 23; +const RoomID kNorad60 = 24; +const RoomID kNorad60West = 25; +const RoomID kNorad61 = 26; +const RoomID kNorad62 = 27; +const RoomID kNorad63 = 28; +const RoomID kNorad64 = 29; +const RoomID kNorad65 = 30; +const RoomID kNorad66 = 31; +const RoomID kNorad67 = 32; +const RoomID kNorad68 = 33; +const RoomID kNorad68West = 34; +const RoomID kNorad69 = 35; +const RoomID kNorad78 = 36; +const RoomID kNorad79 = 37; +const RoomID kNorad79West = 38; // Hot Spot Activation IDs. // Hot Spot IDs. -const tHotSpotID kNorad48ElevatorSpotID = 5000; -const tHotSpotID kNorad48ElevatorOutSpotID = 5001; -const tHotSpotID kNorad48ElevatorUpSpotID = 5002; -const tHotSpotID kNorad49ElevatorSpotID = 5003; -const tHotSpotID kNorad49ElevatorOutSpotID = 5004; -const tHotSpotID kNorad49ElevatorDownSpotID = 5005; -const tHotSpotID kNorad50DoorSpotID = 5006; -const tHotSpotID kNorad50DoorOutSpotID = 5007; -const tHotSpotID kDeltaUpperPressureDoorUpSpotID = 5008; -const tHotSpotID kDeltaUpperPressureDoorDownSpotID = 5009; -const tHotSpotID kNorad54DoorSpotID = 5010; -const tHotSpotID kNorad54DoorOutSpotID = 5011; -const tHotSpotID kNorad59WestSpotID = 5012; -const tHotSpotID kNorad59WestOutSpotID = 5013; -const tHotSpotID kDeltaLowerPressureDoorUpSpotID = 5014; -const tHotSpotID kDeltaLowerPressureDoorDownSpotID = 5015; -const tHotSpotID kDelta59RobotHeadSpotID = 5016; -const tHotSpotID kDelta59RobotShieldBiochipSpotID = 5017; -const tHotSpotID kDelta59RobotOpMemBiochipSpotID = 5018; -const tHotSpotID kDelta59RobotRetinalBiochipSpotID = 5019; -const tHotSpotID kNorad60MonitorSpotID = 5020; -const tHotSpotID kNorad60MonitorOutSpotID = 5021; -const tHotSpotID kNorad60LaunchPrepSpotID = 5022; -const tHotSpotID kNorad60ClawControlSpotID = 5023; -const tHotSpotID kNorad60ClawPinchSpotID = 5024; -const tHotSpotID kNorad60ClawDownSpotID = 5025; -const tHotSpotID kNorad60ClawRightSpotID = 5026; -const tHotSpotID kNorad60ClawLeftSpotID = 5027; -const tHotSpotID kNorad60ClawUpSpotID = 5028; -const tHotSpotID kNorad60ClawCCWSpotID = 5029; -const tHotSpotID kNorad60ClawCWSpotID = 5030; -const tHotSpotID kDelta60RobotHeadSpotID = 5031; -const tHotSpotID kDelta60RobotShieldBiochipSpotID = 5032; -const tHotSpotID kDelta60RobotOpMemBiochipSpotID = 5033; -const tHotSpotID kDelta60RobotRetinalBiochipSpotID = 5034; -const tHotSpotID kNorad68WestSpotID = 5035; -const tHotSpotID kNorad68WestOutSpotID = 5036; -const tHotSpotID kNorad79WestSpotID = 5037; -const tHotSpotID kNorad79WestOutSpotID = 5038; -const tHotSpotID kNorad79SpinLeftSpotID = 5039; -const tHotSpotID kNorad79SpinRightSpotID = 5040; -const tHotSpotID kNorad79SpinUpSpotID = 5041; -const tHotSpotID kNorad79SpinDownSpotID = 5042; -const tHotSpotID kNorad79SiloAreaSpotID = 5043; +const HotSpotID kNorad48ElevatorSpotID = 5000; +const HotSpotID kNorad48ElevatorOutSpotID = 5001; +const HotSpotID kNorad48ElevatorUpSpotID = 5002; +const HotSpotID kNorad49ElevatorSpotID = 5003; +const HotSpotID kNorad49ElevatorOutSpotID = 5004; +const HotSpotID kNorad49ElevatorDownSpotID = 5005; +const HotSpotID kNorad50DoorSpotID = 5006; +const HotSpotID kNorad50DoorOutSpotID = 5007; +const HotSpotID kDeltaUpperPressureDoorUpSpotID = 5008; +const HotSpotID kDeltaUpperPressureDoorDownSpotID = 5009; +const HotSpotID kNorad54DoorSpotID = 5010; +const HotSpotID kNorad54DoorOutSpotID = 5011; +const HotSpotID kNorad59WestSpotID = 5012; +const HotSpotID kNorad59WestOutSpotID = 5013; +const HotSpotID kDeltaLowerPressureDoorUpSpotID = 5014; +const HotSpotID kDeltaLowerPressureDoorDownSpotID = 5015; +const HotSpotID kDelta59RobotHeadSpotID = 5016; +const HotSpotID kDelta59RobotShieldBiochipSpotID = 5017; +const HotSpotID kDelta59RobotOpMemBiochipSpotID = 5018; +const HotSpotID kDelta59RobotRetinalBiochipSpotID = 5019; +const HotSpotID kNorad60MonitorSpotID = 5020; +const HotSpotID kNorad60MonitorOutSpotID = 5021; +const HotSpotID kNorad60LaunchPrepSpotID = 5022; +const HotSpotID kNorad60ClawControlSpotID = 5023; +const HotSpotID kNorad60ClawPinchSpotID = 5024; +const HotSpotID kNorad60ClawDownSpotID = 5025; +const HotSpotID kNorad60ClawRightSpotID = 5026; +const HotSpotID kNorad60ClawLeftSpotID = 5027; +const HotSpotID kNorad60ClawUpSpotID = 5028; +const HotSpotID kNorad60ClawCCWSpotID = 5029; +const HotSpotID kNorad60ClawCWSpotID = 5030; +const HotSpotID kDelta60RobotHeadSpotID = 5031; +const HotSpotID kDelta60RobotShieldBiochipSpotID = 5032; +const HotSpotID kDelta60RobotOpMemBiochipSpotID = 5033; +const HotSpotID kDelta60RobotRetinalBiochipSpotID = 5034; +const HotSpotID kNorad68WestSpotID = 5035; +const HotSpotID kNorad68WestOutSpotID = 5036; +const HotSpotID kNorad79WestSpotID = 5037; +const HotSpotID kNorad79WestOutSpotID = 5038; +const HotSpotID kNorad79SpinLeftSpotID = 5039; +const HotSpotID kNorad79SpinRightSpotID = 5040; +const HotSpotID kNorad79SpinUpSpotID = 5041; +const HotSpotID kNorad79SpinDownSpotID = 5042; +const HotSpotID kNorad79SiloAreaSpotID = 5043; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp index 39cccc64fc..d413554c05 100755 --- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp +++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp @@ -197,28 +197,27 @@ void GlobeTracker::stopGlobeMovie() { } // Globe game PICTs: - -static const tResIDType kGlobeCircleLeftPICTID = 300; -static const tResIDType kGlobeCircleRightPICTID = 301; -static const tResIDType kGlobeCircleUpPICTID = 302; -static const tResIDType kGlobeCircleDownPICTID = 303; -static const tResIDType kTargetUpperLeftPICTID = 304; -static const tResIDType kTargetUpperRightPICTID = 305; -static const tResIDType kTargetLowerLeftPICTID = 306; -static const tResIDType kTargetLowerRightPICTID = 307; -static const tResIDType kMotionHiliteLeftPICTID = 308; -static const tResIDType kMotionHiliteRightPICTID = 309; -static const tResIDType kMotionHiliteUpPICTID = 310; -static const tResIDType kMotionHiliteDownPICTID = 311; - -const tResIDType kGlobeCountdownDigitsID = 350; +static const ResIDType kGlobeCircleLeftPICTID = 300; +static const ResIDType kGlobeCircleRightPICTID = 301; +static const ResIDType kGlobeCircleUpPICTID = 302; +static const ResIDType kGlobeCircleDownPICTID = 303; +static const ResIDType kTargetUpperLeftPICTID = 304; +static const ResIDType kTargetUpperRightPICTID = 305; +static const ResIDType kTargetLowerLeftPICTID = 306; +static const ResIDType kTargetLowerRightPICTID = 307; +static const ResIDType kMotionHiliteLeftPICTID = 308; +static const ResIDType kMotionHiliteRightPICTID = 309; +static const ResIDType kMotionHiliteUpPICTID = 310; +static const ResIDType kMotionHiliteDownPICTID = 311; + +static const ResIDType kGlobeCountdownDigitsID = 350; static const int kGlobeCountdownWidth = 28; static const int kGlobeCountdownHeight = 12; static const int kGlobeCountdownOffset1 = 12; static const int kGlobeCountdownOffset2 = 20; -GlobeCountdown::GlobeCountdown(const tDisplayElementID id) : IdlerAnimation(id) { +GlobeCountdown::GlobeCountdown(const DisplayElementID id) : IdlerAnimation(id) { _digits.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kGlobeCountdownDigitsID); Common::Rect r; @@ -228,7 +227,7 @@ GlobeCountdown::GlobeCountdown(const tDisplayElementID id) : IdlerAnimation(id) sizeElement(kGlobeCountdownWidth, kGlobeCountdownHeight); } -void GlobeCountdown::setDisplayOrder(const tDisplayOrder order) { +void GlobeCountdown::setDisplayOrder(const DisplayOrder order) { IdlerAnimation::setDisplayOrder(order); } @@ -240,7 +239,7 @@ void GlobeCountdown::hide() { IdlerAnimation::hide(); } -void GlobeCountdown::moveElementTo(const tCoordType x, const tCoordType y) { +void GlobeCountdown::moveElementTo(const CoordType x, const CoordType y) { IdlerAnimation::moveElementTo(x, y); } @@ -379,11 +378,11 @@ static const TimeValue kGlobeMovieStartTime = 2 * 2 * kNumLongSlices * 600 / 15; static const TimeValue kTimePerGlobeFrame = 40; -static const tNotificationFlags kGlobeSplash1Finished = 1; -static const tNotificationFlags kGlobeTimerExpired = kGlobeSplash1Finished << 1; -static const tNotificationFlags kMaxDeactivatedFinished = kGlobeTimerExpired << 1; +static const NotificationFlags kGlobeSplash1Finished = 1; +static const NotificationFlags kGlobeTimerExpired = kGlobeSplash1Finished << 1; +static const NotificationFlags kMaxDeactivatedFinished = kGlobeTimerExpired << 1; -static const tNotificationFlags kGlobeNotificationFlags = kGlobeSplash1Finished | +static const NotificationFlags kGlobeNotificationFlags = kGlobeSplash1Finished | kGlobeTimerExpired | kMaxDeactivatedFinished; @@ -422,7 +421,6 @@ enum { }; // TODO: Use ScummVM equivalent - static const float kPI = 3.1415926535f; float degreesToRadians(float angle) { @@ -433,7 +431,7 @@ float radiansToDegrees(float angle) { return (angle * 180) / kPI; } -GlobeGame::GlobeGame(Neighborhood* handler) : GameInteraction(kNoradGlobeGameInteractionID, handler), +GlobeGame::GlobeGame(Neighborhood *handler) : GameInteraction(kNoradGlobeGameInteractionID, handler), _monitorMovie(kGlobeMonitorID), _globeMovie(kGlobeMovieID), _upperNamesMovie(kGlobeUpperNamesID), _lowerNamesMovie(kGlobeLowerNamesID), _globeNotification(kNoradGlobeNotificationID, (PegasusEngine *)g_engine), _globeCircleLeft(kGlobeCircleLeftID), _globeCircleRight(kGlobeCircleRightID), @@ -614,7 +612,7 @@ void GlobeGame::closeInteraction() { _neighborhoodNotification->cancelNotification(this); } -void GlobeGame::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void GlobeGame::receiveNotification(Notification *notification, const NotificationFlags flags) { TimeScale scale = _monitorMovie.getScale(); if (notification == _neighborhoodNotification) { diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.h b/engines/pegasus/neighborhood/norad/delta/globegame.h index e2fe318f09..9c31a931fc 100755 --- a/engines/pegasus/neighborhood/norad/delta/globegame.h +++ b/engines/pegasus/neighborhood/norad/delta/globegame.h @@ -70,17 +70,17 @@ protected: class GlobeCountdown : public IdlerAnimation { public: - GlobeCountdown(const tDisplayElementID); + GlobeCountdown(const DisplayElementID); virtual ~GlobeCountdown() {} void setCountdownTime(const int); void startCountdown(); void stopCountdown(); - void setDisplayOrder(const tDisplayOrder); + void setDisplayOrder(const DisplayOrder); void show(); void hide(); - void moveElementTo(const tCoordType, const tCoordType); + void moveElementTo(const CoordType, const CoordType); void draw(const Common::Rect &); @@ -125,7 +125,7 @@ protected: void initInteraction(); void closeInteraction(); - void receiveNotification(Notification *, const tNotificationFlags); + void receiveNotification(Notification *, const NotificationFlags); void spinGlobe(const Input &, const Hotspot *, GlobeTrackDirection); void clickGlobe(const Input &); diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp index 8f4df726a2..2b208aab71 100755 --- a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp +++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp @@ -199,7 +199,7 @@ void NoradDelta::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSp } } -GameInteraction *NoradDelta::makeInteraction(const tInteractionID interactionID) { +GameInteraction *NoradDelta::makeInteraction(const InteractionID interactionID) { if (interactionID == kNoradGlobeGameInteractionID) return new GlobeGame(this); @@ -210,14 +210,14 @@ void NoradDelta::playClawMonitorIntro() { playSpotSoundSync(kLoadClawIntroIn, kLoadClawIntroOut); } -void NoradDelta::getExitEntry(const tRoomID room, const tDirectionConstant direction, ExitTable::Entry &entry) { +void NoradDelta::getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry) { Norad::getExitEntry(room, direction, entry); if (room == kNorad61 && direction == kSouth) entry.movieStart += kNoradDeltaFrameDuration; } -void NoradDelta::getZoomEntry(const tHotSpotID id, ZoomTable::Entry &zoomEntry) { +void NoradDelta::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) { Norad::getZoomEntry(id, zoomEntry); if (id == kNorad59WestSpotID && GameState.getNoradPlayedGlobeGame()) { @@ -263,7 +263,7 @@ void NoradDelta::loadAmbientLoops() { */ if (GameState.getNoradArrivedFromSub()) { - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if (room == kNorad79West) { if (_privateFlags.getFlag(kNoradPrivateFinishedGlobeGameFlag)) @@ -304,7 +304,7 @@ void NoradDelta::loadAmbientLoops() { } } -void NoradDelta::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) { +void NoradDelta::checkContinuePoint(const RoomID room, const DirectionConstant direction) { switch (MakeRoomView(room, direction)) { case MakeRoomView(kNorad41, kEast): case MakeRoomView(kNorad49, kEast): @@ -317,7 +317,7 @@ void NoradDelta::checkContinuePoint(const tRoomID room, const tDirectionConstant } } -void NoradDelta::arriveAt(const tRoomID room, const tDirectionConstant direction) { +void NoradDelta::arriveAt(const RoomID room, const DirectionConstant direction) { if (room != kNorad68) GameState.setNoradRetScanGood(false); @@ -411,7 +411,7 @@ void NoradDelta::succeedRetinalScan() { GameState.setScoringUsedRetinalChip(true); } -void NoradDelta::getDoorEntry(const tRoomID room, const tDirectionConstant direction, DoorTable::Entry &entry) { +void NoradDelta::getDoorEntry(const RoomID room, const DirectionConstant direction, DoorTable::Entry &entry) { Norad::getDoorEntry(room, direction, entry); if (room == kNorad68 && direction == kWest && !GameState.getNoradRetScanGood()) @@ -430,9 +430,9 @@ bool NoradDelta::playingAgainstRobot() { return GameState.getNoradPlayedGlobeGame(); } -void NoradDelta::getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID, - tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, - tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) { +void NoradDelta::getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID, + HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, + HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) { outSpotID = kNorad60MonitorOutSpotID; prepSpotID = kNorad60LaunchPrepSpotID; clawControlSpotID = kNorad60ClawControlSpotID; @@ -462,7 +462,7 @@ void NoradDelta::playerBeatRobotWithClaw() { g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/Norad/XN59WD", false, kWarningInterruption); } -TimeValue NoradDelta::getViewTime(const tRoomID room, const tDirectionConstant direction) { +TimeValue NoradDelta::getViewTime(const RoomID room, const DirectionConstant direction) { ExtraTable::Entry entry; if (room == kNorad41 && direction == kSouth && !GameState.getNoradArrivedFromSub()) { @@ -582,7 +582,7 @@ void NoradDelta::clickInHotspot(const Input &input, const Hotspot *clickedSpot) } } -void NoradDelta::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void NoradDelta::receiveNotification(Notification *notification, const NotificationFlags flags) { Norad::receiveNotification(notification, flags); if ((flags & kExtraCompletedFlag) != 0) { @@ -702,7 +702,7 @@ void NoradDelta::dropItemIntoRoom(Item *item, Hotspot *hotspot) { } Hotspot *NoradDelta::getItemScreenSpot(Item *item, DisplayElement *element) { - tHotSpotID id = kNoHotSpotID; + HotSpotID id = kNoHotSpotID; switch (item->getObjectID()) { case kShieldBiochip: @@ -814,7 +814,7 @@ Common::String NoradDelta::getHintMovie(uint hintNum) { return movieName; } -void NoradDelta::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) { +void NoradDelta::closeDoorOffScreen(const RoomID room, const DirectionConstant) { switch (room) { case kNorad47: case kNorad48: diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.h b/engines/pegasus/neighborhood/norad/delta/noraddelta.h index 69798b5189..11065f2c9d 100755 --- a/engines/pegasus/neighborhood/norad/delta/noraddelta.h +++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.h @@ -43,14 +43,14 @@ public: void finishedGlobeGame(); - virtual GameInteraction *makeInteraction(const tInteractionID); + virtual GameInteraction *makeInteraction(const InteractionID); void playClawMonitorIntro(); - virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, - tHotSpotID &pinchClawSpotID, tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, - tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, tHotSpotID &clawCCWSpotID, - tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&); + virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, + HotSpotID &pinchClawSpotID, HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, + HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, HotSpotID &clawCCWSpotID, + HotSpotID &clawCWSpotID, uint32 &, const uint32 *&); void playerBeatRobotWithClaw(); void playerBeatRobotWithDoor(); @@ -61,9 +61,9 @@ public: Common::String getEnvScanMovie(); uint getNumHints(); Common::String getHintMovie(uint); - void closeDoorOffScreen(const tRoomID, const tDirectionConstant); + void closeDoorOffScreen(const RoomID, const DirectionConstant); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); bool canSolve(); void doSolve(); @@ -83,16 +83,16 @@ protected: static const uint32 _noradDeltaClawExtras[22]; - void getExitEntry(const tRoomID, const tDirectionConstant, ExitTable::Entry &); - void getZoomEntry(const tHotSpotID, ZoomTable::Entry &); - virtual void arriveAt(const tRoomID, const tDirectionConstant); + void getExitEntry(const RoomID, const DirectionConstant, ExitTable::Entry &); + void getZoomEntry(const HotSpotID, ZoomTable::Entry &); + virtual void arriveAt(const RoomID, const DirectionConstant); void arriveAtNorad68West(); void arriveAtNorad79West(); - TimeValue getViewTime(const tRoomID, const tDirectionConstant); + TimeValue getViewTime(const RoomID, const DirectionConstant); void openDoor(); void activateHotspots(); void clickInHotspot(const Input &, const Hotspot *); - void receiveNotification(Notification *, const tNotificationFlags); + void receiveNotification(Notification *, const NotificationFlags); void pickedUpItem(Item *item); void takeItemFromRoom(Item *item); void dropItemIntoRoom(Item *item, Hotspot *); @@ -102,7 +102,7 @@ protected: void failRetinalScan(); void succeedRetinalScan(); - void getDoorEntry(const tRoomID, const tDirectionConstant, DoorTable::Entry &); + void getDoorEntry(const RoomID, const DirectionConstant, DoorTable::Entry &); void bumpIntoWall(); diff --git a/engines/pegasus/neighborhood/norad/norad.cpp b/engines/pegasus/neighborhood/norad/norad.cpp index 8e891f37c1..9ee8205ec1 100755 --- a/engines/pegasus/neighborhood/norad/norad.cpp +++ b/engines/pegasus/neighborhood/norad/norad.cpp @@ -37,14 +37,14 @@ namespace Pegasus { -const tNotificationFlags kDoneWithPressureDoorNotification = 1; +const NotificationFlags kDoneWithPressureDoorNotification = 1; -const tNotificationFlags kNoradNotificationFlags = kDoneWithPressureDoorNotification; +const NotificationFlags kNoradNotificationFlags = kDoneWithPressureDoorNotification; // This class handles everything that Norad Alpha and Delta have in common, such as // oxygen mask usage, the elevator and the pressure doors. -Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id) : +Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, NeighborhoodID id) : Neighborhood(nextHandler, vm, resName, id), _noradNotification(kNoradNotificationID, vm) { _elevatorUpSpotID = kNoHotSpotID; _elevatorDownSpotID = kNoHotSpotID; @@ -81,36 +81,36 @@ Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String _noradNotification.notifyMe(this, kNoradNotificationFlags, kNoradNotificationFlags); } -GameInteraction *Norad::makeInteraction(const tInteractionID interactionID) { +GameInteraction *Norad::makeInteraction(const InteractionID interactionID) { PressureDoor *pressureDoor; SubControlRoom *subControl; switch (interactionID) { - case kNoradElevatorInteractionID: - return new NoradElevator(this, _elevatorUpRoomID, _elevatorDownRoomID, _elevatorUpSpotID, _elevatorDownSpotID); - case kNoradPressureDoorInteractionID: - if (GameState.getCurrentRoom() == _upperPressureDoorRoom) - pressureDoor = new PressureDoor(this, true, _upperPressureDoorUpSpotID, _upperPressureDoorDownSpotID, - _upperPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut); - else - pressureDoor = new PressureDoor(this, false, _lowerPressureDoorUpSpotID, _lowerPressureDoorDownSpotID, - _lowerPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut); - - if (GameState.getCurrentRoom() == kNorad59West && playingAgainstRobot()) - pressureDoor->playAgainstRobot(); - - return pressureDoor; - case kNoradSubControlRoomInteractionID: - subControl = new SubControlRoom(this); - - if (GameState.getCurrentRoom() == kNorad60West && playingAgainstRobot()) - subControl->playAgainstRobot(); - - return subControl; - case kNoradSubPlatformInteractionID: - return new SubPlatform(this); - default: - return 0; + case kNoradElevatorInteractionID: + return new NoradElevator(this, _elevatorUpRoomID, _elevatorDownRoomID, _elevatorUpSpotID, _elevatorDownSpotID); + case kNoradPressureDoorInteractionID: + if (GameState.getCurrentRoom() == _upperPressureDoorRoom) + pressureDoor = new PressureDoor(this, true, _upperPressureDoorUpSpotID, _upperPressureDoorDownSpotID, + _upperPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut); + else + pressureDoor = new PressureDoor(this, false, _lowerPressureDoorUpSpotID, _lowerPressureDoorDownSpotID, + _lowerPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut); + + if (GameState.getCurrentRoom() == kNorad59West && playingAgainstRobot()) + pressureDoor->playAgainstRobot(); + + return pressureDoor; + case kNoradSubControlRoomInteractionID: + subControl = new SubControlRoom(this); + + if (GameState.getCurrentRoom() == kNorad60West && playingAgainstRobot()) + subControl->playAgainstRobot(); + + return subControl; + case kNoradSubPlatformInteractionID: + return new SubPlatform(this); + default: + return 0; } } @@ -126,14 +126,14 @@ void Norad::start() { void Norad::activateHotspots() { Neighborhood::activateHotspots(); - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); if (room == _elevatorUpRoomID) _neighborhoodHotspots.activateOneHotspot(_elevatorDownSpotID); else if (room == _elevatorDownRoomID) _neighborhoodHotspots.activateOneHotspot(_elevatorUpSpotID); } -void Norad::arriveAt(const tRoomID room, const tDirectionConstant direction) { +void Norad::arriveAt(const RoomID room, const DirectionConstant direction) { Neighborhood::arriveAt(room, direction); if (GameState.getCurrentRoom() == _elevatorUpRoomID || GameState.getCurrentRoom() == _elevatorDownRoomID) @@ -176,7 +176,7 @@ void Norad::arriveAtSubControlRoom() { newInteraction(kNoradSubControlRoomInteractionID); } -int16 Norad::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) { +int16 Norad::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) { int16 result = Neighborhood::getStaticCompassAngle(room, dir); if (room == _elevatorUpRoomID || room == _elevatorDownRoomID) @@ -189,7 +189,7 @@ int16 Norad::getStaticCompassAngle(const tRoomID room, const tDirectionConstant return result; } -tCanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) { +CanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) { if (((GameState.getCurrentRoom() == _subRoomEntryRoom1 && GameState.getCurrentDirection() == _subRoomEntryDir1) || (GameState.getCurrentRoom() == _subRoomEntryRoom2 && GameState.getCurrentDirection() == _subRoomEntryDir2)) && GameState.getNoradSubRoomPressure() != kNormalSubRoomPressure) @@ -198,7 +198,7 @@ tCanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) { return Neighborhood::canOpenDoor(entry); } -void Norad::cantOpenDoor(tCanOpenDoorReason reason) { +void Norad::cantOpenDoor(CanOpenDoorReason reason) { if (reason == kCantOpenBadPressure) playSpotSoundSync(_pressureSoundIn, _pressureSoundOut); else @@ -251,7 +251,7 @@ void Norad::checkAirMask() { loadAmbientLoops(); } -void Norad::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void Norad::receiveNotification(Notification *notification, const NotificationFlags flags) { if (notification == &_neighborhoodNotification && (flags & kAirTimerExpiredFlag) != 0) ((PegasusEngine *)g_engine)->die(kDeathGassedInNorad); diff --git a/engines/pegasus/neighborhood/norad/norad.h b/engines/pegasus/neighborhood/norad/norad.h index eb4c480bf8..4723410b4c 100755 --- a/engines/pegasus/neighborhood/norad/norad.h +++ b/engines/pegasus/neighborhood/norad/norad.h @@ -34,23 +34,23 @@ namespace Pegasus { class Norad : public Neighborhood { public: - Norad(InputHandler *, PegasusEngine *owner, const Common::String &resName, const tNeighborhoodID); + Norad(InputHandler *, PegasusEngine *owner, const Common::String &resName, const NeighborhoodID); virtual ~Norad() {} void flushGameState(); virtual void start(); - virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, - tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID, - tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, - tHotSpotID &moveClawLeftSpotID,tHotSpotID &moveClawUpSpotID, - tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&) = 0; + virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, + HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID, + HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, + HotSpotID &moveClawLeftSpotID,HotSpotID &moveClawUpSpotID, + HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &, const uint32 *&) = 0; void checkAirMask(); virtual uint16 getDateResID() const; - virtual GameInteraction *makeInteraction(const tInteractionID); + virtual GameInteraction *makeInteraction(const InteractionID); Common::String getBriefingMovie(); @@ -61,49 +61,49 @@ public: void doneWithPressureDoor(); protected: - tCanOpenDoorReason canOpenDoor(DoorTable::Entry &); - void cantOpenDoor(tCanOpenDoorReason); - int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + CanOpenDoorReason canOpenDoor(DoorTable::Entry &); + void cantOpenDoor(CanOpenDoorReason); + int16 getStaticCompassAngle(const RoomID, const DirectionConstant); virtual void startExitMovie(const ExitTable::Entry &); void startZoomMovie(const ZoomTable::Entry &); virtual void upButton(const Input &); virtual void activateHotspots(); - virtual void arriveAt(const tRoomID, const tDirectionConstant); + virtual void arriveAt(const RoomID, const DirectionConstant); virtual void arriveAtNoradElevator(); virtual void arriveAtUpperPressureDoorRoom(); virtual void arriveAtLowerPressureDoorRoom(); virtual void arriveAtSubPlatformRoom(); virtual void arriveAtSubControlRoom(); void setUpAirMask(); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); virtual bool playingAgainstRobot() { return false; } Notification _noradNotification; bool _doneWithPressureDoor; - tRoomID _elevatorUpRoomID; - tRoomID _elevatorDownRoomID; - tHotSpotID _elevatorUpSpotID; - tHotSpotID _elevatorDownSpotID; + RoomID _elevatorUpRoomID; + RoomID _elevatorDownRoomID; + HotSpotID _elevatorUpSpotID; + HotSpotID _elevatorDownSpotID; TimeBase _airMaskTimer; NotificationCallBack _airMaskCallBack; - tRoomID _subRoomEntryRoom1; - tDirectionConstant _subRoomEntryDir1; - tRoomID _subRoomEntryRoom2; - tDirectionConstant _subRoomEntryDir2; - tRoomID _upperPressureDoorRoom; - tRoomID _lowerPressureDoorRoom; + RoomID _subRoomEntryRoom1; + DirectionConstant _subRoomEntryDir1; + RoomID _subRoomEntryRoom2; + DirectionConstant _subRoomEntryDir2; + RoomID _upperPressureDoorRoom; + RoomID _lowerPressureDoorRoom; - tHotSpotID _upperPressureDoorUpSpotID; - tHotSpotID _upperPressureDoorDownSpotID; - tHotSpotID _upperPressureDoorAbortSpotID; + HotSpotID _upperPressureDoorUpSpotID; + HotSpotID _upperPressureDoorDownSpotID; + HotSpotID _upperPressureDoorAbortSpotID; - tHotSpotID _lowerPressureDoorUpSpotID; - tHotSpotID _lowerPressureDoorDownSpotID; - tHotSpotID _lowerPressureDoorAbortSpotID; + HotSpotID _lowerPressureDoorUpSpotID; + HotSpotID _lowerPressureDoorDownSpotID; + HotSpotID _lowerPressureDoorAbortSpotID; TimeValue _pressureSoundIn; TimeValue _pressureSoundOut; @@ -112,8 +112,8 @@ protected: TimeValue _accessDeniedIn; TimeValue _accessDeniedOut; - tRoomID _platformRoom; - tRoomID _subControlRoom; + RoomID _platformRoom; + RoomID _subControlRoom; }; } // End of namespace Pegasus diff --git a/engines/pegasus/neighborhood/norad/noradelevator.cpp b/engines/pegasus/neighborhood/norad/noradelevator.cpp index 0cdc818cab..f3f1e1ce38 100755 --- a/engines/pegasus/neighborhood/norad/noradelevator.cpp +++ b/engines/pegasus/neighborhood/norad/noradelevator.cpp @@ -31,15 +31,14 @@ namespace Pegasus { -// Norad elevator PICTs: - -const tResIDType kElevatorLabelID = 200; -const tResIDType kElevatorButtonsID = 201; -const tResIDType kElevatorDownOnID = 202; -const tResIDType kElevatorUpOnID = 203; - -NoradElevator::NoradElevator(Neighborhood *handler, const tRoomID upRoom, const tRoomID downRoom, - const tHotSpotID upHotspot, const tHotSpotID downHotspot) : GameInteraction(kNoradElevatorInteractionID, handler), +// Norad elevator PICTs: +const ResIDType kElevatorLabelID = 200; +const ResIDType kElevatorButtonsID = 201; +const ResIDType kElevatorDownOnID = 202; +const ResIDType kElevatorUpOnID = 203; + +NoradElevator::NoradElevator(Neighborhood *handler, const RoomID upRoom, const RoomID downRoom, + const HotSpotID upHotspot, const HotSpotID downHotspot) : GameInteraction(kNoradElevatorInteractionID, handler), _elevatorControls(kNoradElevatorControlsID), _elevatorNotification(kNoradElevatorNotificationID, ((PegasusEngine *)g_engine)) { _timerExpired = false; _upRoom = upRoom; @@ -110,7 +109,7 @@ void NoradElevator::activateHotspots() { } void NoradElevator::clickInHotspot(const Input &input, const Hotspot *spot) { - tHotSpotID id = spot->getObjectID(); + HotSpotID id = spot->getObjectID(); if (id == _upHotspot || id == _downHotspot) { g_neighborhood->moveForward(); @@ -123,7 +122,7 @@ void NoradElevator::clickInHotspot(const Input &input, const Hotspot *spot) { } } -void NoradElevator::receiveNotification(Notification *, const tNotificationFlags) { +void NoradElevator::receiveNotification(Notification *, const NotificationFlags) { _elevatorControls.setCurrentFrameIndex(1); _timerExpired = true; } diff --git a/engines/pegasus/neighborhood/norad/noradelevator.h b/engines/pegasus/neighborhood/norad/noradelevator.h index 58dc8abf39..a34c77b2e0 100755 --- a/engines/pegasus/neighborhood/norad/noradelevator.h +++ b/engines/pegasus/neighborhood/norad/noradelevator.h @@ -37,7 +37,7 @@ class Neighborhood; class NoradElevator : public GameInteraction, private NotificationReceiver { public: - NoradElevator(Neighborhood *, const tRoomID, const tRoomID, const tHotSpotID, const tHotSpotID); + NoradElevator(Neighborhood *, const RoomID, const RoomID, const HotSpotID, const HotSpotID); virtual ~NoradElevator() {} protected: @@ -49,12 +49,12 @@ protected: virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); - virtual void receiveNotification(Notification*, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); - tRoomID _upRoom; - tRoomID _downRoom; - tHotSpotID _upHotspot; - tHotSpotID _downHotspot; + RoomID _upRoom; + RoomID _downRoom; + HotSpotID _upHotspot; + HotSpotID _downHotspot; Sprite _elevatorControls; TimeBase _elevatorTimer; NotificationCallBack _elevatorCallBack; diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.cpp b/engines/pegasus/neighborhood/norad/pressuredoor.cpp index 7cb483f63a..3675f4373b 100755 --- a/engines/pegasus/neighborhood/norad/pressuredoor.cpp +++ b/engines/pegasus/neighborhood/norad/pressuredoor.cpp @@ -48,17 +48,17 @@ const TimeValue kDecreasingPressureTime = 5; const TimeValue kCautionLoopStart = 6; const TimeValue kCautionLoopStop = 7; -const tNotificationFlags kSplashFinished = 1; -const tNotificationFlags kPressureDroppingFlag = kSplashFinished << 1; +const NotificationFlags kSplashFinished = 1; +const NotificationFlags kPressureDroppingFlag = kSplashFinished << 1; -const tNotificationFlags kPressureNotificationFlags = kSplashFinished | +const NotificationFlags kPressureNotificationFlags = kSplashFinished | kPressureDroppingFlag; -const tNotificationFlags kDoorJumpsUpFlag = 1; -const tNotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1; -const tNotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1; +const NotificationFlags kDoorJumpsUpFlag = 1; +const NotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1; +const NotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1; -const tNotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag | +const NotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag | kDoorJumpsBackFlag | kDoorCrushedFlag; @@ -81,7 +81,7 @@ enum { kGameOver }; -// Pressure values range from 0 to 11. +// Pressure values range from 0 to 11. const short kMinPressure = 0; const short kMaxPressure = 11; @@ -93,20 +93,19 @@ const TimeValue kApproachPunchInTime = 122 * kNavTimePerFrame; const TimeValue kLoopPunchInTime = 38 * kNavTimePerFrame; const TimeValue kPunchThroughTime = 38 * kNavTimePerFrame; -// Pressure door PICTs: +// Pressure door PICTs: +const ResIDType kUpperPressureUpOffPICTID = 400; +const ResIDType kUpperPressureUpOnPICTID = 401; +const ResIDType kUpperPressureDownOffPICTID = 402; +const ResIDType kUpperPressureDownOnPICTID = 403; -const tResIDType kUpperPressureUpOffPICTID = 400; -const tResIDType kUpperPressureUpOnPICTID = 401; -const tResIDType kUpperPressureDownOffPICTID = 402; -const tResIDType kUpperPressureDownOnPICTID = 403; +const ResIDType kLowerPressureUpOffPICTID = 404; +const ResIDType kLowerPressureUpOnPICTID = 405; +const ResIDType kLowerPressureDownOffPICTID = 406; +const ResIDType kLowerPressureDownOnPICTID = 407; -const tResIDType kLowerPressureUpOffPICTID = 404; -const tResIDType kLowerPressureUpOnPICTID = 405; -const tResIDType kLowerPressureDownOffPICTID = 406; -const tResIDType kLowerPressureDownOnPICTID = 407; - -PressureDoor::PressureDoor(Neighborhood *handler, bool isUpperDoor, const tHotSpotID upSpotID, const tHotSpotID downSpotID, - const tHotSpotID outSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn, +PressureDoor::PressureDoor(Neighborhood *handler, bool isUpperDoor, const HotSpotID upSpotID, const HotSpotID downSpotID, + const HotSpotID outSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn, TimeValue equalizeSoundOut) : GameInteraction(kNoradPressureDoorInteractionID, handler), _levelsMovie(kPressureDoorLevelsID), _typeMovie(kPressureDoorTypeID), _upButton(kPressureDoorUpButtonID), _downButton(kPressureDoorDownButtonID), _pressureNotification(kNoradPressureNotificationID, ((PegasusEngine *)g_engine)), @@ -262,7 +261,7 @@ void PressureDoor::playAgainstRobot() { _playingAgainstRobot = true; } -void PressureDoor::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void PressureDoor::receiveNotification(Notification *notification, const NotificationFlags flags) { Neighborhood *owner = getOwner(); if (notification == _neighborhoodNotification) { @@ -443,7 +442,7 @@ void PressureDoor::activateHotspots() { } void PressureDoor::clickInHotspot(const Input &input, const Hotspot *spot) { - tHotSpotID id = spot->getObjectID(); + HotSpotID id = spot->getObjectID(); if (id == _upHotspotID || id == _downHotspotID) { if (id == _upHotspotID) @@ -457,7 +456,7 @@ void PressureDoor::clickInHotspot(const Input &input, const Hotspot *spot) { } } -void PressureDoor::incrementPressure(const tHotSpotID id) { +void PressureDoor::incrementPressure(const HotSpotID id) { _typeMovie.stop(); _typeMovie.setSegment(0, _typeMovie.getDuration()); _typeMovie.setFlags(0); diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.h b/engines/pegasus/neighborhood/norad/pressuredoor.h index 94868bdd8c..5ae8c9b53a 100755 --- a/engines/pegasus/neighborhood/norad/pressuredoor.h +++ b/engines/pegasus/neighborhood/norad/pressuredoor.h @@ -37,12 +37,12 @@ const short kNormalSubRoomPressure = 2; class PressureDoor : public GameInteraction, public NotificationReceiver { public: - PressureDoor(Neighborhood *, bool isUpperDoor, const tHotSpotID, const tHotSpotID, - const tHotSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, + PressureDoor(Neighborhood *, bool isUpperDoor, const HotSpotID, const HotSpotID, + const HotSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn, TimeValue equalizeSoundOut); virtual ~PressureDoor() {} - void incrementPressure(const tHotSpotID); + void incrementPressure(const HotSpotID); void stopChangingPressure(); void playAgainstRobot(); @@ -58,7 +58,7 @@ protected: virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); Movie _levelsMovie; TimeScale _levelsScale; @@ -70,9 +70,9 @@ protected: NotificationCallBack _pressureCallBack; Notification *_neighborhoodNotification; int _gameState; - tHotSpotID _upHotspotID; - tHotSpotID _downHotspotID; - tHotSpotID _outHotspotID; + HotSpotID _upHotspotID; + HotSpotID _downHotspotID; + HotSpotID _outHotspotID; PressureTracker _doorTracker; TimeValue _pressureSoundIn; TimeValue _pressureSoundOut; diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp index 0515f967e8..476dd92a61 100755 --- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp +++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp @@ -141,15 +141,15 @@ const TimeValue kDeltaLaunchPrepStop = 30; // Right monitor times. -const tNotificationFlags kAlphaSplashFinished = 1; -const tNotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1; -const tNotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1; -const tNotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1; -const tNotificationFlags kClawMenuFinished = kClawHighlightFinished << 1; -const tNotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1; -const tNotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1; - -const tNotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished | +const NotificationFlags kAlphaSplashFinished = 1; +const NotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1; +const NotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1; +const NotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1; +const NotificationFlags kClawMenuFinished = kClawHighlightFinished << 1; +const NotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1; +const NotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1; + +const NotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished | kAlphaPrepFinished | kPrepHighlightFinished | kClawHighlightFinished | @@ -157,9 +157,9 @@ const tNotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished | kDeltaSplashFinished | kDeltaPrepFinished; -const tNotificationFlags kOneSecondOfMoveFinished = 1; +const NotificationFlags kOneSecondOfMoveFinished = 1; -const tNotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished; +const NotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished; enum { kButtonDimFrame, @@ -414,10 +414,9 @@ enum { kRobotWon }; -// Sub Control Room button PICTs: - -const tResIDType kSubControlButtonBaseID = 500; -const tResIDType kClawMonitorGreenBallBaseID = 600; +// Sub Control Room button PICTs: +const ResIDType kSubControlButtonBaseID = 500; +const ResIDType kClawMonitorGreenBallBaseID = 600; // Constructor SubControlRoom::SubControlRoom(Neighborhood *handler) : GameInteraction(kNoradSubControlRoomInteractionID, handler), @@ -558,7 +557,7 @@ void SubControlRoom::setSoundFXLevel(const uint16 fxLevel) { _subControlMovie.setVolume(fxLevel); } -void SubControlRoom::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void SubControlRoom::receiveNotification(Notification *notification, const NotificationFlags flags) { Norad *owner = (Norad *)getOwner(); if (notification == &_subControlNotification) { @@ -780,7 +779,7 @@ void SubControlRoom::hideButtons() { _buttons[i]->hide(); } -int SubControlRoom::findActionIndex(tHotSpotID id) { +int SubControlRoom::findActionIndex(HotSpotID id) { for (int i = 0; i < kNumClawButtons; i++) if (id == _clawButtonSpotIDs[i]) return i; @@ -789,7 +788,7 @@ int SubControlRoom::findActionIndex(tHotSpotID id) { } void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) { - tHotSpotID clickedID = spot->getObjectID(); + HotSpotID clickedID = spot->getObjectID(); int actionIndex = findActionIndex(clickedID); if (actionIndex != kNoActionIndex) { @@ -934,7 +933,7 @@ void SubControlRoom::setControlMonitorToTime(const TimeValue newTime, const int allowInput(shouldAllowInput); } -void SubControlRoom::playControlMonitorSection(const TimeValue in, const TimeValue out, const tNotificationFlags flags, +void SubControlRoom::playControlMonitorSection(const TimeValue in, const TimeValue out, const NotificationFlags flags, const int newState, const bool shouldAllowInput) { _subControlMovie.stop(); _subControlMovie.setSegment(in, out); @@ -974,7 +973,7 @@ void SubControlRoom::setClawMonitorToTime(const TimeValue newTime) { _clawMonitorMovie.redrawMovieWorld(); } -void SubControlRoom::playClawMonitorSection(const TimeValue in, const TimeValue out, const tNotificationFlags flags, +void SubControlRoom::playClawMonitorSection(const TimeValue in, const TimeValue out, const NotificationFlags flags, const int newState, const bool shouldAllowInput) { _clawMonitorMovie.stop(); _clawMonitorMovie.setSegment(in, out); @@ -1168,7 +1167,7 @@ void SubControlRoom::doSolve() { getOwner()->startExtraSequence(kN60ArmGrabsRobot, kExtraCompletedFlag, kFilterAllInput); } -tInputBits SubControlRoom::getInputFilter() { +InputBits SubControlRoom::getInputFilter() { if (_playingAgainstRobot) return GameInteraction::getInputFilter() & ~kFilterDownButtonAny; diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.h b/engines/pegasus/neighborhood/norad/subcontrolroom.h index deea5042d0..e7ee84929a 100755 --- a/engines/pegasus/neighborhood/norad/subcontrolroom.h +++ b/engines/pegasus/neighborhood/norad/subcontrolroom.h @@ -60,12 +60,12 @@ protected: virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); void robotKillsPlayer(const uint32, Neighborhood *); - tInputBits getInputFilter(); + InputBits getInputFilter(); - int findActionIndex(tHotSpotID); + int findActionIndex(HotSpotID); void dispatchClawAction(const int); void performActionImmediately(const int, const uint32, Neighborhood *); @@ -80,12 +80,12 @@ protected: void moveGreenBallToD(); void setControlMonitorToTime(const TimeValue, const int, const bool); - void playControlMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags, + void playControlMonitorSection(const TimeValue, const TimeValue, const NotificationFlags, const int, const bool); void updateClawMonitor(); void setClawMonitorToTime(const TimeValue); - void playClawMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags, + void playClawMonitorSection(const TimeValue, const TimeValue, const NotificationFlags, const int, const bool); Movie _subControlMovie; @@ -117,10 +117,10 @@ protected: Notification _greenBallNotification; NotificationCallBack _greenBallCallBack; - tHotSpotID _outSpotID; - tHotSpotID _prepSpotID; - tHotSpotID _clawControlSpotID; - tHotSpotID _clawButtonSpotIDs[kNumClawButtons]; + HotSpotID _outSpotID; + HotSpotID _prepSpotID; + HotSpotID _clawControlSpotID; + HotSpotID _clawButtonSpotIDs[kNumClawButtons]; Notification *_neighborhoodNotification; diff --git a/engines/pegasus/neighborhood/norad/subplatform.cpp b/engines/pegasus/neighborhood/norad/subplatform.cpp index dd2058c3d9..7f1df535b5 100755 --- a/engines/pegasus/neighborhood/norad/subplatform.cpp +++ b/engines/pegasus/neighborhood/norad/subplatform.cpp @@ -47,12 +47,12 @@ const TimeValue kPrepIncompleteStop = 19; const TimeValue kDamagedStart = 19; const TimeValue kDamagedStop = 28; -const tNotificationFlags kNormalSplashFinished = 1; -const tNotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; -const tNotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; -const tNotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; +const NotificationFlags kNormalSplashFinished = 1; +const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; +const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; +const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; -const tNotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | +const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | kPrepSubFinished | kPrepIncompleteFinished | kDamagedFinished; @@ -99,7 +99,7 @@ void SubPlatform::setSoundFXLevel(const uint16 fxLevel) { _platformMovie.setVolume(fxLevel); } -void SubPlatform::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void SubPlatform::receiveNotification(Notification *notification, const NotificationFlags flags) { FaderMoveSpec loop1Spec, loop2Spec; ExtraTable::Entry entry; diff --git a/engines/pegasus/neighborhood/norad/subplatform.h b/engines/pegasus/neighborhood/norad/subplatform.h index ae35cceb8f..a83487db23 100755 --- a/engines/pegasus/neighborhood/norad/subplatform.h +++ b/engines/pegasus/neighborhood/norad/subplatform.h @@ -48,7 +48,7 @@ protected: virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); - virtual void receiveNotification(Notification *, const tNotificationFlags); + virtual void receiveNotification(Notification *, const NotificationFlags); Movie _platformMovie; TimeScale _platformScale; |