From 12efb47b536d2f663c9cde2739a1fd40599da669 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Fri, 16 Dec 2011 14:17:50 -0500 Subject: PEGASUS: Remove t prefix from typedefs Some other minor cleanup too --- engines/pegasus/constants.h | 639 ++++++++++++++++++++++---------------------- 1 file changed, 319 insertions(+), 320 deletions(-) (limited to 'engines/pegasus/constants.h') diff --git a/engines/pegasus/constants.h b/engines/pegasus/constants.h index 17466b0dd4..e98ebd0997 100755 --- a/engines/pegasus/constants.h +++ b/engines/pegasus/constants.h @@ -35,69 +35,73 @@ namespace Pegasus { // TODO: Organize these -const tGameID kGameIDNothing = -1; - -const tActorID kNoActorID = kGameIDNothing; -const tActorID kPlayerID = 0; -const tItemID kNoItemID = kGameIDNothing; -const tRoomID kNoRoomID = kGameIDNothing; -const tExtraID kNoExtraID = 0xFFFFFFFF; -const tNeighborhoodID kNoNeighborhoodID = kGameIDNothing; -const tAlternateID kNoAlternateID = 0; -const tGameMenuCommand kMenuCmdNoCommand = 0; - -const tHotSpotActivationID kActivateHotSpotAlways = 0; -const tHotSpotActivationID kActivateHotSpotNever = -1; - -const tItemState kNoItemState = -1; - -const tDirectionConstant kNoDirection = 0xFF; - -const tTurnDirection kNoTurn = 0xFF; -const tTurnDirection kTurnLeft = 0; -const tTurnDirection kTurnRight = 1; -const tTurnDirection kTurnUp = 2; -const tTurnDirection kTurnDown = 3; -const tTurnDirection kMaxTurns = 4; - -const tGameMode kNoMode = -1; -const tGameMode kModeNavigation = 0; -const tGameMode kLastGameShellMode = kModeNavigation; - -const tCanMoveForwardReason kCanMoveForward = 0; -const tCanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1; -const tCanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1; -const tCanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1; -const tCanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked; - -const tCanTurnReason kCanTurn = 0; -const tCanTurnReason kCantTurnNoTurn = kCanTurn + 1; -const tCanTurnReason kCantTurnLastReason = kCantTurnNoTurn; - -const tCanOpenDoorReason kCanOpenDoor = 0; -const tCanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1; -const tCanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1; -const tCanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1; -const tCanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen; - -const tDisplayElementID kNoDisplayElement = -1; -const tDisplayElementID kHighestReservedElementID = -2; - -const tDisplayElementID kCursorID = kHighestReservedElementID; -const tDisplayElementID kLoadScreenID = kCursorID - 1; - -const tDisplayOrder kMinAvailableOrder = 0; -const tDisplayOrder kMaxAvailableOrder = 999998; -const tDisplayOrder kLoadScreenOrder = 900000; -const tDisplayOrder kCursorOrder = 1000000; - -const tHotSpotID kNoHotSpotID = -1; -const tHotSpotFlags kNoHotSpotFlags = 0; -const tHotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags; - -const tNotificationFlags kNoNotificationFlags = 0; - -const tDisplayElementID kCurrentDragSpriteID = 1000; +const GameID kGameIDNothing = -1; + +const ActorID kNoActorID = kGameIDNothing; +const ActorID kPlayerID = 0; +const ItemID kNoItemID = kGameIDNothing; +const RoomID kNoRoomID = kGameIDNothing; +const ExtraID kNoExtraID = 0xFFFFFFFF; +const NeighborhoodID kNoNeighborhoodID = kGameIDNothing; +const AlternateID kNoAlternateID = 0; +const GameMenuCommand kMenuCmdNoCommand = 0; + +const HotSpotActivationID kActivateHotSpotAlways = 0; +const HotSpotActivationID kActivateHotSpotNever = -1; + +const ItemState kNoItemState = -1; + +const DirectionConstant kNoDirection = 0xFF; +static const DirectionConstant kNorth = 0; +static const DirectionConstant kSouth = 1; +static const DirectionConstant kEast = 2; +static const DirectionConstant kWest = 3; + +const TurnDirection kNoTurn = 0xFF; +const TurnDirection kTurnLeft = 0; +const TurnDirection kTurnRight = 1; +const TurnDirection kTurnUp = 2; +const TurnDirection kTurnDown = 3; +const TurnDirection kMaxTurns = 4; + +const GameMode kNoMode = -1; +const GameMode kModeNavigation = 0; +const GameMode kLastGameShellMode = kModeNavigation; + +const CanMoveForwardReason kCanMoveForward = 0; +const CanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1; +const CanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1; +const CanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1; +const CanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked; + +const CanTurnReason kCanTurn = 0; +const CanTurnReason kCantTurnNoTurn = kCanTurn + 1; +const CanTurnReason kCantTurnLastReason = kCantTurnNoTurn; + +const CanOpenDoorReason kCanOpenDoor = 0; +const CanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1; +const CanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1; +const CanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1; +const CanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen; + +const DisplayElementID kNoDisplayElement = -1; +const DisplayElementID kHighestReservedElementID = -2; + +const DisplayElementID kCursorID = kHighestReservedElementID; +const DisplayElementID kLoadScreenID = kCursorID - 1; + +const DisplayOrder kMinAvailableOrder = 0; +const DisplayOrder kMaxAvailableOrder = 999998; +const DisplayOrder kLoadScreenOrder = 900000; +const DisplayOrder kCursorOrder = 1000000; + +const HotSpotID kNoHotSpotID = -1; +const HotSpotFlags kNoHotSpotFlags = 0; +const HotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags; + +const NotificationFlags kNoNotificationFlags = 0; + +const DisplayElementID kCurrentDragSpriteID = 1000; const TimeScale kDefaultTimeScale = 600; @@ -217,23 +221,23 @@ const TimeValue kPlasmaImpactTime = kTwoSeconds; const TimeValue kNoradAirMaskTimeLimit = kOneMinute + kFifteenSeconds; -const tNotificationID kNeighborhoodNotificationID = 1; -const tNotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID; - -const tNotificationFlags kNeighborhoodMovieCompletedFlag = 1; -const tNotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1; -const tNotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1; -const tNotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1; -const tNotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1; -const tNotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1; -const tNotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1; -const tNotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1; -const tNotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1; -const tNotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1; -const tNotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1; -const tNotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag; - -const tNotificationFlags kNeighborhoodFlags = kNeighborhoodMovieCompletedFlag | +const NotificationID kNeighborhoodNotificationID = 1; +const NotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID; + +const NotificationFlags kNeighborhoodMovieCompletedFlag = 1; +const NotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1; +const NotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1; +const NotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1; +const NotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1; +const NotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1; +const NotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1; +const NotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1; +const NotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1; +const NotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1; +const NotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1; +const NotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag; + +const NotificationFlags kNeighborhoodFlags = kNeighborhoodMovieCompletedFlag | kMoveForwardCompletedFlag | kStrideCompletedFlag | kTurnCompletedFlag | @@ -262,146 +266,146 @@ const char kContinueSave = 1; // Display IDs. -const tDisplayElementID kNavMovieID = 1; -const tDisplayElementID kTurnPushID = 2; +const DisplayElementID kNavMovieID = 1; +const DisplayElementID kTurnPushID = 2; -const tDisplayElementID kMaxGameShellDisplayID = kTurnPushID; +const DisplayElementID kMaxGameShellDisplayID = kTurnPushID; // Display ordering. -const tDisplayOrder kNavLayer = 10000; -const tDisplayOrder kNavMovieOrder = kNavLayer; -const tDisplayOrder kTurnPushOrder = kNavMovieOrder + 1; +const DisplayOrder kNavLayer = 10000; +const DisplayOrder kNavMovieOrder = kNavLayer; +const DisplayOrder kTurnPushOrder = kNavMovieOrder + 1; ///////////////////////////////////////////// // // Display IDs. -const tDisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1; -const tDisplayElementID kInterface1ID = kScreenDimmerID + 1; -const tDisplayElementID kInterface2ID = kInterface1ID + 1; -const tDisplayElementID kInterface3ID = kInterface2ID + 1; -const tDisplayElementID kInterface4ID = kInterface3ID + 1; -const tDisplayElementID kDateID = kInterface4ID + 1; -const tDisplayElementID kCompassID = kDateID + 1; -const tDisplayElementID kInventoryPushID = kCompassID + 1; -const tDisplayElementID kInventoryLidID = kInventoryPushID + 1; -const tDisplayElementID kBiochipPushID = kInventoryLidID + 1; -const tDisplayElementID kBiochipLidID = kBiochipPushID + 1; -const tDisplayElementID kEnergyBarID = kBiochipLidID + 1; -const tDisplayElementID kWarningLightID = kEnergyBarID + 1; -const tDisplayElementID kAILeftAreaID = kWarningLightID + 1; -const tDisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1; -const tDisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1; -const tDisplayElementID kAIMovieID = kAIRightAreaID + 1; -const tDisplayElementID kInventoryDropHighlightID = kAIMovieID + 1; -const tDisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1; +const DisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1; +const DisplayElementID kInterface1ID = kScreenDimmerID + 1; +const DisplayElementID kInterface2ID = kInterface1ID + 1; +const DisplayElementID kInterface3ID = kInterface2ID + 1; +const DisplayElementID kInterface4ID = kInterface3ID + 1; +const DisplayElementID kDateID = kInterface4ID + 1; +const DisplayElementID kCompassID = kDateID + 1; +const DisplayElementID kInventoryPushID = kCompassID + 1; +const DisplayElementID kInventoryLidID = kInventoryPushID + 1; +const DisplayElementID kBiochipPushID = kInventoryLidID + 1; +const DisplayElementID kBiochipLidID = kBiochipPushID + 1; +const DisplayElementID kEnergyBarID = kBiochipLidID + 1; +const DisplayElementID kWarningLightID = kEnergyBarID + 1; +const DisplayElementID kAILeftAreaID = kWarningLightID + 1; +const DisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1; +const DisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1; +const DisplayElementID kAIMovieID = kAIRightAreaID + 1; +const DisplayElementID kInventoryDropHighlightID = kAIMovieID + 1; +const DisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1; -const tDisplayElementID kDraggingSpriteID = 1000; +const DisplayElementID kDraggingSpriteID = 1000; -const tDisplayElementID kCroppedMovieID = 2000; +const DisplayElementID kCroppedMovieID = 2000; -const tDisplayElementID kNeighborhoodDisplayID = 3000; +const DisplayElementID kNeighborhoodDisplayID = 3000; -const tDisplayElementID kItemPictureBaseID = 5000; +const DisplayElementID kItemPictureBaseID = 5000; -const tCoordType kNavAreaLeft = 64; -const tCoordType kNavAreaTop = 64; +const CoordType kNavAreaLeft = 64; +const CoordType kNavAreaTop = 64; -const tCoordType kBackground1Left = 0; -const tCoordType kBackground1Top = 64; +const CoordType kBackground1Left = 0; +const CoordType kBackground1Top = 64; -const tCoordType kBackground2Left = 0; -const tCoordType kBackground2Top = 0; +const CoordType kBackground2Left = 0; +const CoordType kBackground2Top = 0; -const tCoordType kBackground3Left = 576; -const tCoordType kBackground3Top = 64; +const CoordType kBackground3Left = 576; +const CoordType kBackground3Top = 64; -const tCoordType kBackground4Left = 0; -const tCoordType kBackground4Top = 320; +const CoordType kBackground4Left = 0; +const CoordType kBackground4Top = 320; -const tCoordType kOverviewControllerLeft = 540; -const tCoordType kOverviewControllerTop = 348; +const CoordType kOverviewControllerLeft = 540; +const CoordType kOverviewControllerTop = 348; -const tCoordType kSwapLeft = 194; -const tCoordType kSwapTop = 116; +const CoordType kSwapLeft = 194; +const CoordType kSwapTop = 116; -const tCoordType kSwapHiliteLeft = 200; -const tCoordType kSwapHiliteTop = 206; +const CoordType kSwapHiliteLeft = 200; +const CoordType kSwapHiliteTop = 206; -const tCoordType kDateLeft = 136; -const tCoordType kDateTop = 44; +const CoordType kDateLeft = 136; +const CoordType kDateTop = 44; -const tCoordType kCompassLeft = 222; -const tCoordType kCompassTop = 42; -const tCoordType kCompassWidth = 92; +const CoordType kCompassLeft = 222; +const CoordType kCompassTop = 42; +const CoordType kCompassWidth = 92; -const tCoordType kInventoryPushLeft = 74; -const tCoordType kInventoryPushTop = 92; +const CoordType kInventoryPushLeft = 74; +const CoordType kInventoryPushTop = 92; -const tCoordType kInventoryLidLeft = 74; -const tCoordType kInventoryLidTop = 316; +const CoordType kInventoryLidLeft = 74; +const CoordType kInventoryLidTop = 316; -const tCoordType kBiochipPushLeft = 362; -const tCoordType kBiochipPushTop = 192; +const CoordType kBiochipPushLeft = 362; +const CoordType kBiochipPushTop = 192; -const tCoordType kBiochipLidLeft = 362; -const tCoordType kBiochipLidTop = 316; +const CoordType kBiochipLidLeft = 362; +const CoordType kBiochipLidTop = 316; -const tCoordType kInventoryDropLeft = 0; -const tCoordType kInventoryDropTop = 320; -const tCoordType kInventoryDropRight = 232; -const tCoordType kInventoryDropBottom = 480; +const CoordType kInventoryDropLeft = 0; +const CoordType kInventoryDropTop = 320; +const CoordType kInventoryDropRight = 232; +const CoordType kInventoryDropBottom = 480; -const tCoordType kBiochipDropLeft = 302; -const tCoordType kBiochipDropTop = 320; -const tCoordType kBiochipDropRight = 640; -const tCoordType kBiochipDropBottom = 480; +const CoordType kBiochipDropLeft = 302; +const CoordType kBiochipDropTop = 320; +const CoordType kBiochipDropRight = 640; +const CoordType kBiochipDropBottom = 480; -const tCoordType kFinalMessageLeft = kInventoryPushLeft + 1; -const tCoordType kFinalMessageTop = kInventoryPushTop + 24; +const CoordType kFinalMessageLeft = kInventoryPushLeft + 1; +const CoordType kFinalMessageTop = kInventoryPushTop + 24; ///////////////////////////////////////////// // // Notifications. -const tNotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1; -const tNotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1; -const tNotificationID kAINotificationID = kInterfaceNotificationID + 1; -const tNotificationID kNoradNotificationID = kAINotificationID + 1; -const tNotificationID kNoradECRNotificationID = kNoradNotificationID + 1; -const tNotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1; -const tNotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1; -const tNotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1; -const tNotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1; -const tNotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1; -const tNotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1; -const tNotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1; -const tNotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1; -const tNotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1; -const tNotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1; -const tNotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1; +const NotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1; +const NotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1; +const NotificationID kAINotificationID = kInterfaceNotificationID + 1; +const NotificationID kNoradNotificationID = kAINotificationID + 1; +const NotificationID kNoradECRNotificationID = kNoradNotificationID + 1; +const NotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1; +const NotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1; +const NotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1; +const NotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1; +const NotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1; +const NotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1; +const NotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1; +const NotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1; +const NotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1; +const NotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1; +const NotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1; // Sent to the shell by fShellNotification. -const tNotificationFlags kGameStartingFlag = 1; -const tNotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1; -const tNotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1; +const NotificationFlags kGameStartingFlag = 1; +const NotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1; +const NotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1; -const tNotificationFlags kJMPShellNotificationFlags = kGameStartingFlag | +const NotificationFlags kJMPShellNotificationFlags = kGameStartingFlag | kNeedNewJumpFlag | kPlayerDiedFlag; // Sent to the interface. -const tNotificationFlags kInventoryLidOpenFlag = 1; -const tNotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1; -const tNotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1; -const tNotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1; -const tNotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1; -const tNotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1; -const tNotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1; -const tNotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1; - -const tNotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | +const NotificationFlags kInventoryLidOpenFlag = 1; +const NotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1; +const NotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1; +const NotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1; +const NotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1; +const NotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1; +const NotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1; +const NotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1; + +const NotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | kInventoryLidClosedFlag | kInventoryDrawerUpFlag | kInventoryDrawerDownFlag | @@ -414,28 +418,28 @@ const tNotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFlag | // Neighborhood hot spots. -const tHotSpotID kFirstNeighborhoodSpotID = 5000; +const HotSpotID kFirstNeighborhoodSpotID = 5000; // kShellSpotFlag is a flag which marks all hot spots which belong to the shell, like // the current item and current biochip spots. -const tHotSpotFlags kShellSpotFlag = 1; +const HotSpotFlags kShellSpotFlag = 1; // kNeighborhoodSpotFlag is a flag which marks all hot spots which belong to a // neighborhood, like buttons on walls and so on. -const tHotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1; +const HotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1; // kZoomInSpotFlag is a flag which marks all hot spots which indicate a zoom. -const tHotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1; +const HotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1; // kZoomOutSpotFlag is a flag which marks all hot spots which indicate a zoom. -const tHotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1; +const HotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1; -const tHotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1; -const tHotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1; -const tHotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1; -const tHotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1; -const tHotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1; +const HotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1; +const HotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1; +const HotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1; +const HotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1; +const HotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1; -const tHotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag; +const HotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag; -const tHotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; +const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; ///////////////////////////////////////////// // @@ -444,64 +448,64 @@ const tHotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; // Shell hot spots. // The shell reserves all hot spot IDs from 0 to 999 -const tHotSpotID kCurrentItemSpotID = 0; -const tHotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1; +const HotSpotID kCurrentItemSpotID = 0; +const HotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1; -const tHotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1; -const tHotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1; +const HotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1; +const HotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1; -const tHotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1; +const HotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1; -const tHotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1; -const tHotSpotID kAIHint2SpotID = kAIHint1SpotID + 1; -const tHotSpotID kAIHint3SpotID = kAIHint2SpotID + 1; -const tHotSpotID kAISolveSpotID = kAIHint3SpotID + 1; -const tHotSpotID kAIBriefingSpotID = kAISolveSpotID + 1; -const tHotSpotID kAIScanSpotID = kAIBriefingSpotID + 1; +const HotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1; +const HotSpotID kAIHint2SpotID = kAIHint1SpotID + 1; +const HotSpotID kAIHint3SpotID = kAIHint2SpotID + 1; +const HotSpotID kAISolveSpotID = kAIHint3SpotID + 1; +const HotSpotID kAIBriefingSpotID = kAISolveSpotID + 1; +const HotSpotID kAIScanSpotID = kAIBriefingSpotID + 1; -const tHotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1; +const HotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1; -const tHotSpotID kAriesSpotID = kPegasusRecallSpotID + 1; -const tHotSpotID kMercurySpotID = kAriesSpotID + 1; -const tHotSpotID kPoseidonSpotID = kMercurySpotID + 1; +const HotSpotID kAriesSpotID = kPegasusRecallSpotID + 1; +const HotSpotID kMercurySpotID = kAriesSpotID + 1; +const HotSpotID kPoseidonSpotID = kMercurySpotID + 1; -const tHotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1; +const HotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1; -const tHotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1; -const tHotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1; -const tHotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1; -const tHotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1; -const tHotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1; +const HotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1; +const HotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1; +const HotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1; +const HotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1; +const HotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1; // Most of these are obsolete: // kInventoryDropSpotFlag is a flag which marks hot spots which are valid drop spots // for inventory items. -// const tHotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; +// const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; // kBiochipDropSpotFlag is a flag which marks hot spots which are valid drop spots // for biochips. -// const tHotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; +// const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; // kInventorySpotFlag is a flag which marks hot spots which indicate inventory items // in the environment. -// const tHotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; +// const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; // kBiochipSpotFlag is a flag which marks hot spots which indicate biochips // in the environment. -const tHotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1; -const tHotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1; +const HotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1; +const HotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1; -const tHotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1; +const HotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1; // Biochip and inventory hot spot flags... -const tHotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1; -const tHotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1; -const tHotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1; -const tHotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1; +const HotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1; +const HotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1; +const HotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1; +const HotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1; -const tHotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag | +const HotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag | kPlayExtraSpotFlag | kOpenDoorSpotFlag | kInfoReturnSpotFlag | @@ -519,30 +523,30 @@ const int32 kDeathMenuID = 4; // // Menu commands. -const tGameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1; -const tGameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1; -const tGameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1; -const tGameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1; -const tGameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1; -const tGameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1; +const GameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1; +const GameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1; +const GameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1; +const GameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1; +const GameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1; +const GameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1; -const tGameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1; +const GameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1; -const tGameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1; -const tGameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1; +const GameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1; +const GameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1; -const tGameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1; -const tGameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1; +const GameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1; +const GameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1; -const tGameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1; -const tGameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1; -const tGameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1; -const tGameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1; +const GameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1; +const GameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1; +const GameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1; +const GameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1; -const tGameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1; +const GameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1; -const tGameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1; -const tGameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1; +const GameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1; +const GameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1; const TimeValue kMenuButtonHiliteTime = 20; const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond; @@ -551,74 +555,74 @@ const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond; // Warning light PICTs: -const tResIDType kLightOffID = 128; -const tResIDType kLightYellowID = 129; -const tResIDType kLightOrangeID = 130; -const tResIDType kLightRedID = 131; +const ResIDType kLightOffID = 128; +const ResIDType kLightYellowID = 129; +const ResIDType kLightOrangeID = 130; +const ResIDType kLightRedID = 131; // Date PICTs: -const tResIDType kDatePrehistoricID = 138; -const tResIDType kDate2112ID = 139; -const tResIDType kDate2185ID = 140; -const tResIDType kDate2310ID = 141; -const tResIDType kDate2318ID = 142; +const ResIDType kDatePrehistoricID = 138; +const ResIDType kDate2112ID = 139; +const ResIDType kDate2185ID = 140; +const ResIDType kDate2310ID = 141; +const ResIDType kDate2318ID = 142; ///////////////////////////////////////////// // // Display Order -const tDisplayOrder kCroppedMovieLayer = 11000; - -const tDisplayOrder kMonitorLayer = 12000; - -const tDisplayOrder kDragSpriteLayer = 15000; -const tDisplayOrder kDragSpriteOrder = kDragSpriteLayer; - -const tDisplayOrder kInterfaceLayer = 20000; -const tDisplayOrder kBackground1Order = kInterfaceLayer; -const tDisplayOrder kBackground2Order = kBackground1Order + 1; -const tDisplayOrder kBackground3Order = kBackground2Order + 1; -const tDisplayOrder kBackground4Order = kBackground3Order + 1; -const tDisplayOrder kDateOrder = kBackground4Order + 1; -const tDisplayOrder kCompassOrder = kDateOrder + 1; -const tDisplayOrder kEnergyBarOrder = kCompassOrder + 1; -const tDisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1; - -const tDisplayOrder kAILayer = 22000; -const tDisplayOrder kAILeftAreaOrder = kAILayer; -const tDisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1; -const tDisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1; -const tDisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1; - -const tDisplayOrder kHilitesLayer = 23000; -const tDisplayOrder kInventoryHiliteOrder = kHilitesLayer; -const tDisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1; - -const tDisplayOrder kPanelsLayer = 25000; -const tDisplayOrder kInventoryPushOrder = kPanelsLayer; -const tDisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1; -const tDisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1; -const tDisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1; -const tDisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1; - -const tDisplayOrder kInfoLayer = 26000; -const tDisplayOrder kInfoBackgroundOrder = kInfoLayer; -const tDisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1; - -const tDisplayOrder kScreenDimmerOrder = 30000; - -const tDisplayOrder kPauseScreenLayer = 31000; -const tDisplayOrder kPauseMenuOrder = kPauseScreenLayer; -const tDisplayOrder kSaveGameOrder = kPauseMenuOrder + 1; -const tDisplayOrder kContinueOrder = kSaveGameOrder + 1; -const tDisplayOrder kRestoreOrder = kContinueOrder + 1; -const tDisplayOrder kSoundFXOrder = kRestoreOrder + 1; -const tDisplayOrder kAmbienceOrder = kSoundFXOrder + 1; -const tDisplayOrder kWalkthruOrder = kAmbienceOrder + 1; -const tDisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1; -const tDisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1; -const tDisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1; +const DisplayOrder kCroppedMovieLayer = 11000; + +const DisplayOrder kMonitorLayer = 12000; + +const DisplayOrder kDragSpriteLayer = 15000; +const DisplayOrder kDragSpriteOrder = kDragSpriteLayer; + +const DisplayOrder kInterfaceLayer = 20000; +const DisplayOrder kBackground1Order = kInterfaceLayer; +const DisplayOrder kBackground2Order = kBackground1Order + 1; +const DisplayOrder kBackground3Order = kBackground2Order + 1; +const DisplayOrder kBackground4Order = kBackground3Order + 1; +const DisplayOrder kDateOrder = kBackground4Order + 1; +const DisplayOrder kCompassOrder = kDateOrder + 1; +const DisplayOrder kEnergyBarOrder = kCompassOrder + 1; +const DisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1; + +const DisplayOrder kAILayer = 22000; +const DisplayOrder kAILeftAreaOrder = kAILayer; +const DisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1; +const DisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1; +const DisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1; + +const DisplayOrder kHilitesLayer = 23000; +const DisplayOrder kInventoryHiliteOrder = kHilitesLayer; +const DisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1; + +const DisplayOrder kPanelsLayer = 25000; +const DisplayOrder kInventoryPushOrder = kPanelsLayer; +const DisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1; +const DisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1; +const DisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1; +const DisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1; + +const DisplayOrder kInfoLayer = 26000; +const DisplayOrder kInfoBackgroundOrder = kInfoLayer; +const DisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1; + +const DisplayOrder kScreenDimmerOrder = 30000; + +const DisplayOrder kPauseScreenLayer = 31000; +const DisplayOrder kPauseMenuOrder = kPauseScreenLayer; +const DisplayOrder kSaveGameOrder = kPauseMenuOrder + 1; +const DisplayOrder kContinueOrder = kSaveGameOrder + 1; +const DisplayOrder kRestoreOrder = kContinueOrder + 1; +const DisplayOrder kSoundFXOrder = kRestoreOrder + 1; +const DisplayOrder kAmbienceOrder = kSoundFXOrder + 1; +const DisplayOrder kWalkthruOrder = kAmbienceOrder + 1; +const DisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1; +const DisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1; +const DisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1; ///////////////////////////////////////////// // @@ -674,23 +678,23 @@ enum { kPlayerWonGame }; -static const tCoordType kAILeftAreaLeft = 76; -static const tCoordType kAILeftAreaTop = 334; +static const CoordType kAILeftAreaLeft = 76; +static const CoordType kAILeftAreaTop = 334; -static const tCoordType kAILeftAreaWidth = 96; -static const tCoordType kAILeftAreaHeight = 96; +static const CoordType kAILeftAreaWidth = 96; +static const CoordType kAILeftAreaHeight = 96; -static const tCoordType kAIMiddleAreaLeft = 172; -static const tCoordType kAIMiddleAreaTop = 334; +static const CoordType kAIMiddleAreaLeft = 172; +static const CoordType kAIMiddleAreaTop = 334; -static const tCoordType kAIMiddleAreaWidth = 192; -static const tCoordType kAIMiddleAreaHeight = 96; +static const CoordType kAIMiddleAreaWidth = 192; +static const CoordType kAIMiddleAreaHeight = 96; -static const tCoordType kAIRightAreaLeft = 364; -static const tCoordType kAIRightAreaTop = 334; +static const CoordType kAIRightAreaLeft = 364; +static const CoordType kAIRightAreaTop = 334; -static const tCoordType kAIRightAreaWidth = 96; -static const tCoordType kAIRightAreaHeight = 96; +static const CoordType kAIRightAreaWidth = 96; +static const CoordType kAIRightAreaHeight = 96; enum { kTSAPlayerNotArrived, // initial state, must be zero @@ -712,18 +716,13 @@ enum { kPlayerFinishedWithTSA }; -static const tDirectionConstant kNorth = 0; -static const tDirectionConstant kSouth = 1; -static const tDirectionConstant kEast = 2; -static const tDirectionConstant kWest = 3; - ///////////////////////////////////////////// // // Mode constants. -static const tGameMode kModeInventoryPick = kLastGameShellMode + 1; -static const tGameMode kModeBiochipPick = kModeInventoryPick + 1; -static const tGameMode kModeInfoScreen = kModeBiochipPick + 1; +static const GameMode kModeInventoryPick = kLastGameShellMode + 1; +static const GameMode kModeBiochipPick = kModeInventoryPick + 1; +static const GameMode kModeInfoScreen = kModeBiochipPick + 1; } // End of namespace Pegasus -- cgit v1.2.3