aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/norad/delta
diff options
context:
space:
mode:
Diffstat (limited to 'engines/pegasus/neighborhood/norad/delta')
-rwxr-xr-xengines/pegasus/neighborhood/norad/delta/globegame.cpp48
-rwxr-xr-xengines/pegasus/neighborhood/norad/delta/globegame.h8
-rwxr-xr-xengines/pegasus/neighborhood/norad/delta/noraddelta.cpp28
-rwxr-xr-xengines/pegasus/neighborhood/norad/delta/noraddelta.h26
4 files changed, 54 insertions, 56 deletions
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 04:50:26 +0000