diff options
| author | Matthew Hoops | 2011-12-20 18:26:25 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-20 18:26:25 -0500 |
| commit | a600dcb56a9633ebfae0d726480352b6f2e9b3ba (patch) | |
| tree | fe0707cb889f8f5f424bf97ba280d5aede49e73c | |
| parent | 5fe762e7cdfd2ca72129abe2eac181ae5402aaff (diff) | |
| download | scummvm-rg350-a600dcb56a9633ebfae0d726480352b6f2e9b3ba.tar.gz scummvm-rg350-a600dcb56a9633ebfae0d726480352b6f2e9b3ba.tar.bz2 scummvm-rg350-a600dcb56a9633ebfae0d726480352b6f2e9b3ba.zip | |
PEGASUS: Some space/misc cleanup
41 files changed, 745 insertions, 749 deletions
diff --git a/engines/pegasus/ai/ai_action.h b/engines/pegasus/ai/ai_action.h index 9ac30782a9..6eac976f9c 100755 --- a/engines/pegasus/ai/ai_action.h +++ b/engines/pegasus/ai/ai_action.h @@ -38,7 +38,7 @@ class AITimerCondition; ///////////////////////////////////////////// // -// AIAction +// AIAction class AIAction { friend class AIRule; @@ -58,7 +58,7 @@ typedef Common::List<AIAction *> AIActionList; ///////////////////////////////////////////// // -// AICompoundAction +// AICompoundAction class AICompoundAction : public AIAction { public: @@ -75,7 +75,7 @@ protected: ///////////////////////////////////////////// // -// AIPlayMessageAction +// AIPlayMessageAction class AIPlayMessageAction : public AIAction { public: @@ -91,7 +91,7 @@ protected: ///////////////////////////////////////////// // -// AIStartTimerAction +// AIStartTimerAction class AIStartTimerAction : public AIAction { public: @@ -105,7 +105,7 @@ protected: ///////////////////////////////////////////// // -// AIActivateRuleAction +// AIActivateRuleAction class AIActivateRuleAction : public AIAction { public: @@ -119,7 +119,7 @@ protected: ///////////////////////////////////////////// // -// AIDeactivateRuleAction +// AIDeactivateRuleAction class AIDeactivateRuleAction : public AIAction { public: diff --git a/engines/pegasus/ai/ai_area.cpp b/engines/pegasus/ai/ai_area.cpp index 6203843087..b0836ab638 100755 --- a/engines/pegasus/ai/ai_area.cpp +++ b/engines/pegasus/ai/ai_area.cpp @@ -70,7 +70,7 @@ AIArea::~AIArea() { g_AIArea = 0; } -// Save last state of AI rules... +// Save last state of AI rules... void AIArea::saveAIState() { // TODO } @@ -188,16 +188,16 @@ void AIArea::setAIAreaToTime(const LowerClientSignature client, const LowerAreaS } } -// Plays a sequence on an area. When the sequence ends, the previous image -// is restored. -// Also, is input disabled or not? -// Easy answer: yes. +// Plays a sequence on an area. When the sequence ends, the previous image +// is restored. +// Also, is input disabled or not? +// Easy answer: yes. -// There are only so many legal combinations of client/area. -// Here is the list of supported pairs: -// kBiochipSignature kMiddleAreaSignature -// kBiochipSignature kRightAreaSignature -// kInventorySignature kMiddleAreaSignature +// There are only so many legal combinations of client/area. +// Here is the list of supported pairs: +// kBiochipSignature kMiddleAreaSignature +// kBiochipSignature kRightAreaSignature +// kInventorySignature kMiddleAreaSignature void AIArea::playAIAreaSequence(const LowerClientSignature, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) { PegasusEngine *vm = (PegasusEngine *)g_engine; @@ -336,7 +336,7 @@ bool AIArea::playAIMovie(const LowerAreaSignature area, const Common::String &mo return result; } -// Only implemented for kMiddleAreaSignature, kInventorySignature +// Only implemented for kMiddleAreaSignature, kInventorySignature void AIArea::loopAIAreaSequence(const LowerClientSignature owner, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) { if (area == kMiddleAreaSignature && owner == kInventorySignature && owner == _middleAreaOwner) { _middleAreaMovie.stop(); @@ -387,7 +387,7 @@ void AIArea::setMiddleMovieTime(const LowerClientSignature client, const TimeVal _middleAreaOwner = client; } -// Only called by kBiochipSignature. +// Only called by kBiochipSignature. void AIArea::setRightMovieTime(const TimeValue time) { if (!_AIMovie.isSurfaceValid()) { // Can't do it when the AI movie is up... diff --git a/engines/pegasus/ai/ai_condition.h b/engines/pegasus/ai/ai_condition.h index ba4f41108c..2d93a52eab 100755 --- a/engines/pegasus/ai/ai_condition.h +++ b/engines/pegasus/ai/ai_condition.h @@ -37,7 +37,7 @@ namespace Pegasus { ///////////////////////////////////////////// // -// AICondition +// AICondition class AICondition { public: @@ -56,7 +56,7 @@ public: ///////////////////////////////////////////// // -// AIOneChildCondition +// AIOneChildCondition class AIOneChildCondition : public AICondition { public: @@ -72,7 +72,7 @@ protected: ///////////////////////////////////////////// // -// AITwoChildrenCondition +// AITwoChildrenCondition class AITwoChildrenCondition : public AICondition { public: @@ -88,7 +88,7 @@ protected: ///////////////////////////////////////////// // -// AINotCondition +// AINotCondition class AINotCondition : public AIOneChildCondition { public: @@ -99,7 +99,7 @@ public: ///////////////////////////////////////////// // -// AIAndCondition +// AIAndCondition class AIAndCondition : public AITwoChildrenCondition { public: @@ -110,7 +110,7 @@ public: ///////////////////////////////////////////// // -// AIOrCondition +// AIOrCondition class AIOrCondition : public AITwoChildrenCondition { public: @@ -121,7 +121,7 @@ public: ///////////////////////////////////////////// // -// AITimerCondition +// AITimerCondition class AITimerCondition : public AICondition { public: @@ -144,7 +144,7 @@ protected: ///////////////////////////////////////////// // -// AILocationCondition +// AILocationCondition class AILocationCondition : public AICondition { public: @@ -164,7 +164,7 @@ protected: ///////////////////////////////////////////// // -// AIDoorOpenedCondition +// AIDoorOpenedCondition class AIDoorOpenedCondition : public AICondition { public: @@ -179,7 +179,7 @@ protected: ///////////////////////////////////////////// // -// AIHasItemCondition +// AIHasItemCondition class AIHasItemCondition : public AICondition { public: @@ -193,7 +193,7 @@ protected: ///////////////////////////////////////////// // -// AIDoesntHaveItemCondition +// AIDoesntHaveItemCondition class AIDoesntHaveItemCondition : public AICondition { public: @@ -207,7 +207,7 @@ protected: ///////////////////////////////////////////// // -// AICurrentItemCondition +// AICurrentItemCondition class AICurrentItemCondition : public AICondition { public: @@ -221,7 +221,7 @@ protected: ///////////////////////////////////////////// // -// AICurrentBiochipCondition +// AICurrentBiochipCondition class AICurrentBiochipCondition : public AICondition { public: @@ -235,7 +235,7 @@ protected: ///////////////////////////////////////////// // -// AIItemStateCondition +// AIItemStateCondition class AIItemStateCondition : public AICondition { public: @@ -250,7 +250,7 @@ protected: ///////////////////////////////////////////// // -// AIEnergyMonitorCondition +// AIEnergyMonitorCondition class AIEnergyMonitorCondition : public AICondition { public: @@ -264,7 +264,7 @@ protected: ///////////////////////////////////////////// // -// AILastExtraCondition +// AILastExtraCondition class AILastExtraCondition : public AICondition { public: @@ -278,7 +278,7 @@ protected: ///////////////////////////////////////////// // -// Helper functions +// Helper functions AICondition *makeLocationAndDoesntHaveItemCondition(const RoomID room, const DirectionConstant direction, const ItemID item); diff --git a/engines/pegasus/constants.h b/engines/pegasus/constants.h index eb9a8abe67..77a80256ac 100755 --- a/engines/pegasus/constants.h +++ b/engines/pegasus/constants.h @@ -105,7 +105,7 @@ static const DisplayElementID kCurrentDragSpriteID = 1000; static const TimeScale kDefaultTimeScale = 600; -// Ticks per second. +// Ticks per second. static const TimeScale kOneTickPerSecond = 1; static const TimeScale kTwoTicksPerSecond = 2; @@ -114,7 +114,7 @@ static const TimeScale kThirtyTicksPerSecond = 30; static const TimeScale kSixtyTicksPerSecond = 60; static const TimeScale kMovieTicksPerSecond = 600; -// These times are in seconds. +// These times are in seconds. static const TimeValue kOneSecond = 1; static const TimeValue kTwoSeconds = 2; @@ -166,7 +166,7 @@ static const TimeValue kFiftyMinutes = kOneMinute * 50; static const TimeValue kOneHour = kOneMinute * 60; static const TimeValue kTwoHours = kOneHour * 2; -// Common times. +// Common times. static const TimeValue kHalfSecondPerTwoTicks = kTwoTicksPerSecond / 2; static const TimeValue kHalfSecondPerThirtyTicks = kThirtyTicksPerSecond / 2; @@ -188,7 +188,7 @@ static const TimeValue kOneMinutePerSixtyTicks = kOneMinute * kSixtyTicksPerSeco static const TimeValue kFiveMinutesPerSixtyTicks = kFiveMinutes * kSixtyTicksPerSecond; static const TimeValue kTenMinutesPerSixtyTicks = kTenMinutes * kSixtyTicksPerSecond; -// Time in seconds you can hang around Caldoria without going to work... +// Time in seconds you can hang around Caldoria without going to work... static const TimeValue kLateWarning2TimeLimit = kFiveMinutes; static const TimeValue kLateWarning3TimeLimit = kTenMinutes; @@ -264,14 +264,14 @@ static const uint32 kPegasusPrimeVersion = 0x00009019; static const char kNormalSave = 0; static const char kContinueSave = 1; -// Display IDs. +// Display IDs. static const DisplayElementID kNavMovieID = 1; static const DisplayElementID kTurnPushID = 2; static const DisplayElementID kMaxGameShellDisplayID = kTurnPushID; -// Display ordering. +// Display ordering. static const DisplayOrder kNavLayer = 10000; static const DisplayOrder kNavMovieOrder = kNavLayer; @@ -279,7 +279,7 @@ static const DisplayOrder kTurnPushOrder = kNavMovieOrder + 1; ///////////////////////////////////////////// // -// Display IDs. +// Display IDs. static const DisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1; static const DisplayElementID kInterface1ID = kScreenDimmerID + 1; @@ -367,7 +367,7 @@ static const CoordType kFinalMessageTop = kInventoryPushTop + 24; ///////////////////////////////////////////// // -// Notifications. +// Notifications. static const NotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1; static const NotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1; @@ -386,7 +386,7 @@ static const NotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotific static const NotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1; static const NotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1; -// Sent to the shell by fShellNotification. +// Sent to the shell by fShellNotification. static const NotificationFlags kGameStartingFlag = 1; static const NotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1; static const NotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1; @@ -395,7 +395,7 @@ static const NotificationFlags kJMPShellNotificationFlags = kGameStartingFlag | kNeedNewJumpFlag | kPlayerDiedFlag; -// Sent to the interface. +// Sent to the interface. static const NotificationFlags kInventoryLidOpenFlag = 1; static const NotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1; static const NotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1; @@ -414,21 +414,21 @@ static const NotificationFlags kInterfaceNotificationFlags = kInventoryLidOpenFl kBiochipDrawerUpFlag | kBiochipDrawerDownFlag; -// Hot spots. +// Hot spots. -// Neighborhood hot spots. +// Neighborhood hot spots. static 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. +// kShellSpotFlag is a flag which marks all hot spots which belong to the shell, like +// the current item and current biochip spots. static 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. +// kNeighborhoodSpotFlag is a flag which marks all hot spots which belong to a +// neighborhood, like buttons on walls and so on. static const HotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1; -// kZoomInSpotFlag is a flag which marks all hot spots which indicate a zoom. +// kZoomInSpotFlag is a flag which marks all hot spots which indicate a zoom. static const HotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1; -// kZoomOutSpotFlag is a flag which marks all hot spots which indicate a zoom. +// kZoomOutSpotFlag is a flag which marks all hot spots which indicate a zoom. static const HotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1; static const HotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1; @@ -443,10 +443,10 @@ static const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag; ///////////////////////////////////////////// // -// Hot spots. +// Hot spots. -// Shell hot spots. -// The shell reserves all hot spot IDs from 0 to 999 +// Shell hot spots. +// The shell reserves all hot spot IDs from 0 to 999 static const HotSpotID kCurrentItemSpotID = 0; static const HotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1; @@ -477,28 +477,28 @@ static const HotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1; static const HotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1; static const HotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1; -// Most of these are obsolete: +// Most of these are obsolete: -// kInventoryDropSpotFlag is a flag which marks hot spots which are valid drop spots -// for inventory items. -// static const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; +// kInventoryDropSpotFlag is a flag which marks hot spots which are valid drop spots +// for inventory items. +// static const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1; -// kBiochipDropSpotFlag is a flag which marks hot spots which are valid drop spots -// for biochips. -// static const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; +// kBiochipDropSpotFlag is a flag which marks hot spots which are valid drop spots +// for biochips. +// static const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1; -// kInventorySpotFlag is a flag which marks hot spots which indicate inventory items -// in the environment. -// static const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; +// kInventorySpotFlag is a flag which marks hot spots which indicate inventory items +// in the environment. +// static const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1; -// kBiochipSpotFlag is a flag which marks hot spots which indicate biochips -// in the environment. +// kBiochipSpotFlag is a flag which marks hot spots which indicate biochips +// in the environment. static const HotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1; static const HotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1; static const HotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1; -// Biochip and inventory hot spot flags... +// Biochip and inventory hot spot flags... static const HotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1; static const HotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1; @@ -521,7 +521,7 @@ static const int32 kDeathMenuID = 4; ///////////////////////////////////////////// // -// Menu commands. +// Menu commands. static const GameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1; static const GameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1; @@ -551,16 +551,16 @@ static const GameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1; static const TimeValue kMenuButtonHiliteTime = 20; static const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond; -// PICT resources: +// PICT resources: -// Warning light PICTs: +// Warning light PICTs: static const ResIDType kLightOffID = 128; static const ResIDType kLightYellowID = 129; static const ResIDType kLightOrangeID = 130; static const ResIDType kLightRedID = 131; -// Date PICTs: +// Date PICTs: static const ResIDType kDatePrehistoricID = 138; static const ResIDType kDate2112ID = 139; @@ -570,7 +570,7 @@ static const ResIDType kDate2318ID = 142; ///////////////////////////////////////////// // -// Display Order +// Display Order static const DisplayOrder kCroppedMovieLayer = 11000; @@ -626,7 +626,7 @@ static const DisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1; ///////////////////////////////////////////// // -// Death reasons. +// Death reasons. enum { // Caldoria kDeathUncreatedInCaldoria = 1, @@ -697,10 +697,10 @@ static const CoordType kAIRightAreaWidth = 96; static const CoordType kAIRightAreaHeight = 96; enum { - kTSAPlayerNotArrived, // initial state, must be zero - kTSAPlayerForcedReview, // Player must watch TBP before rip occurs. - kTSAPlayerDetectedRip, // Player finished TBP, rip alarm just went off. - kTSAPlayerNeedsHistoricalLog, // Player is instructed to get historical log + kTSAPlayerNotArrived, // initial state, must be zero + kTSAPlayerForcedReview, // Player must watch TBP before rip occurs. + kTSAPlayerDetectedRip, // Player finished TBP, rip alarm just went off. + kTSAPlayerNeedsHistoricalLog, // Player is instructed to get historical log kTSAPlayerGotHistoricalLog, kTSAPlayerInstalledHistoricalLog, kTSABossSawHistoricalLog, @@ -718,7 +718,7 @@ enum { ///////////////////////////////////////////// // -// Mode static constants. +// Mode static constants. static const GameMode kModeInventoryPick = kLastGameShellMode + 1; static const GameMode kModeBiochipPick = kModeInventoryPick + 1; diff --git a/engines/pegasus/elements.cpp b/engines/pegasus/elements.cpp index 850b9cb8cf..0310d26292 100644 --- a/engines/pegasus/elements.cpp +++ b/engines/pegasus/elements.cpp @@ -135,11 +135,11 @@ void DisplayElement::show() { } } -// Only invalidates this element's bounding rectangle if all these conditions are true: -// -- The triggered element is this element. -// -- The element is displaying on the display list. -// -- The element is visible. -// -- The element is part of the active layer OR is one of the reserved items. +// Only invalidates this element's bounding rectangle if all these conditions are true: +// -- The triggered element is this element. +// -- The element is displaying on the display list. +// -- The element is visible. +// -- The element is part of the active layer OR is one of the reserved items. void DisplayElement::triggerRedraw() { GraphicsManager *gfx = ((PegasusEngine *)g_engine)->_gfx; diff --git a/engines/pegasus/elements.h b/engines/pegasus/elements.h index 009cb3a690..6a465d1602 100644 --- a/engines/pegasus/elements.h +++ b/engines/pegasus/elements.h @@ -131,10 +131,10 @@ protected: TimeValue _lastTime; }; -// This class reads PICT resources and plays them like a movie. -// Assumes there is a resource of type 'PFrm' describing the time values for each -// PICT frame, as well as the total time in the movie. -// Assumes that PICT frames begin at PICT 128 +// This class reads PICT resources and plays them like a movie. +// Assumes there is a resource of type 'PFrm' describing the time values for each +// PICT frame, as well as the total time in the movie. +// Assumes that PICT frames begin at PICT 128 class FrameSequence : public IdlerAnimation { public: diff --git a/engines/pegasus/energymonitor.cpp b/engines/pegasus/energymonitor.cpp index 5f12bf4d94..7a9ca7878a 100755 --- a/engines/pegasus/energymonitor.cpp +++ b/engines/pegasus/energymonitor.cpp @@ -266,7 +266,7 @@ void EnergyMonitor::calibrateEnergyBar() { setEnergyValue(0); setEnergyDrainRate(-(int32)kMaxJMPEnergy / 2); - // Make sure warning light is hidden... + // Make sure warning light is hidden... _energyLight.hide(); while (getCurrentEnergy() != (int32)kMaxJMPEnergy) { vm->checkCallBacks(); diff --git a/engines/pegasus/energymonitor.h b/engines/pegasus/energymonitor.h index 4c111af9cc..02377d515a 100755 --- a/engines/pegasus/energymonitor.h +++ b/engines/pegasus/energymonitor.h @@ -49,10 +49,10 @@ protected: TimeValue _blinkDuration; }; -// Energy monitor constants. +// Energy monitor constants. -// These are in seconds. -// Max is two hours +// These are in seconds. +// Max is two hours static const uint32 kMaxJMPEnergy = 7200; static const uint32 kCasualEnergy = kMaxJMPEnergy * 100 / 100; // 100% diff --git a/engines/pegasus/gamestate.cpp b/engines/pegasus/gamestate.cpp index 0a8597de37..601960e5de 100755 --- a/engines/pegasus/gamestate.cpp +++ b/engines/pegasus/gamestate.cpp @@ -41,7 +41,7 @@ Common::Error GameStateManager::writeGameState(Common::WriteStream *stream) { stream->writeUint16BE(_currentRoom); stream->writeByte(_currentDirection); stream->writeUint16BE(_nexNeighborhoodID); - stream->writeUint16BE(_nexRoomID); + stream->writeUint16BE(_nextRoomID); stream->writeByte(_nextDirection); stream->writeUint16BE(_lastNeighborhood); stream->writeUint16BE(_lastRoom); @@ -71,7 +71,7 @@ Common::Error GameStateManager::readGameState(Common::ReadStream *stream) { _currentRoom = stream->readUint16BE(); _currentDirection = stream->readByte(); _nexNeighborhoodID = stream->readUint16BE(); - _nexRoomID = stream->readUint16BE(); + _nextRoomID = stream->readUint16BE(); _nextDirection = stream->readByte(); _lastNeighborhood = stream->readUint16BE(); _lastRoom = stream->readUint16BE(); @@ -101,7 +101,7 @@ void GameStateManager::resetGameState() { _currentRoom = kNoRoomID; _currentDirection = kNoDirection; _nexNeighborhoodID = kNoNeighborhoodID; - _nexRoomID = kNoRoomID; + _nextRoomID = kNoRoomID; _nextDirection = kNoDirection; _lastNeighborhood = kNoNeighborhoodID; _lastRoom = kNoRoomID; @@ -169,13 +169,13 @@ RoomViewID GameStateManager::getCurrentRoomAndView() { void GameStateManager::getNextLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) { neighborhood = _nexNeighborhoodID; - room = _nexRoomID; + room = _nextRoomID; direction = _nextDirection; } void GameStateManager::setNextLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) { _nexNeighborhoodID = neighborhood; - _nexRoomID = room; + _nextRoomID = room; _nextDirection = direction; } @@ -188,11 +188,11 @@ void GameStateManager::setNextNeighborhood(const NeighborhoodID neighborhood) { } RoomID GameStateManager::getNextRoom() { - return _nexRoomID; + return _nextRoomID; } void GameStateManager::setNextRoom(const RoomID room) { - _nexRoomID = room; + _nextRoomID = room; } DirectionConstant GameStateManager::getNextDirection() { @@ -530,7 +530,7 @@ GameScoreType GameStateManager::getTotalScore() { ///////////////////////////////////////////// // -// Caldoria data +// Caldoria data void GameStateManager::writeCaldoriaState(Common::WriteStream *stream) { _caldoriaFlags.writeToStream(stream); @@ -549,7 +549,7 @@ void GameStateManager::resetCaldoriaState() { ///////////////////////////////////////////// // -// TSA data +// TSA data void GameStateManager::writeTSAState(Common::WriteStream *stream) { _TSAFlags.writeToStream(stream); @@ -580,7 +580,7 @@ void GameStateManager::resetTSAState() { ///////////////////////////////////////////// // -// Prehistoric data +// Prehistoric data void GameStateManager::writePrehistoricState(Common::WriteStream *stream) { _prehistoricFlags.writeToStream(stream); @@ -596,7 +596,7 @@ void GameStateManager::resetPrehistoricState() { ///////////////////////////////////////////// // -// Norad data +// Norad data void GameStateManager::writeNoradState(Common::WriteStream *stream) { _noradFlags.writeToStream(stream); @@ -618,7 +618,7 @@ void GameStateManager::resetNoradState() { ///////////////////////////////////////////// // -// Mars data +// Mars data void GameStateManager::writeMarsState(Common::WriteStream *stream) { _marsFlags.writeToStream(stream); @@ -634,7 +634,7 @@ void GameStateManager::resetMarsState() { ///////////////////////////////////////////// // -// WSC data +// WSC data void GameStateManager::writeWSCState(Common::WriteStream *stream) { _WSCFlags.writeToStream(stream); diff --git a/engines/pegasus/gamestate.h b/engines/pegasus/gamestate.h index 5eab093c5b..7812003e15 100755 --- a/engines/pegasus/gamestate.h +++ b/engines/pegasus/gamestate.h @@ -41,7 +41,7 @@ namespace Common { namespace Pegasus { -// The only things saved in here are things which get written out to a saved game file... +// The only things saved in here are things which get written out to a saved game file... enum { kGlobalWalkthroughFlag, @@ -347,494 +347,494 @@ public: // Pegasus Prime - // Scoring... - // Scoring "Set" functions. - // Caldoria/TSA scoring + // Scoring... + // Scoring "Set" functions. + // Caldoria/TSA scoring void setScoringSawINN(const bool = true); void setScoringTookShower(const bool = true); void setScoringFixedHair(const bool = true); void setScoringGotKeyCard(const bool = true); void setScoringReadPaper(const bool = true); void setScoringLookThroughTelescope(const bool = true); - void setScoringSawCaldoriaKiosk(const bool = true); - void setScoringGoToTSA(const bool = true); - void setScoringEnterTSA(const bool = true); - void setScoringSawBust1(const bool = true); - void setScoringSawBust2(const bool = true); - void setScoringSawBust3(const bool = true); - void setScoringSawBust4(const bool = true); - void setScoringSawBust5(const bool = true); - void setScoringSawBust6(const bool = true); - void setScoringSawTheory(const bool = true); - void setScoringSawBackground(const bool = true); - void setScoringSawProcedure(const bool = true); - void setScoringGotJourneymanKey(const bool = true); - void setScoringGotPegasusBiochip(const bool = true); - void setScoringGotBiosuit(const bool = true); - void setScoringGoToPrehistoric(const bool = true); - void setScoringPutLogInReader(const bool = true); - void setScoringSawCaldoriaNormal(const bool = true); - void setScoringSawCaldoriaAltered(const bool = true); - void setScoringSawNoradNormal(const bool = true); - void setScoringSawNoradAltered(const bool = true); - void setScoringSawMarsNormal(const bool = true); - void setScoringSawMarsAltered(const bool = true); - void setScoringSawWSCNormal(const bool = true); - void setScoringSawWSCAltered(const bool = true); - void setScoringWentToReadyRoom2(const bool = true); - void setScoringWentAfterSinclair(const bool = true); - void setScoringUsedCardBomb(const bool = true); - void setScoringShieldedCardBomb(const bool = true); - void setScoringStunnedSinclair(const bool = true); - void setScoringDisarmedNuke(const bool = true); - - // Prehistoric scoring - void setScoringThrewBreaker(const bool = true); - void setScoringExtendedBridge(const bool = true); - void setScoringGotHistoricalLog(const bool = true); - void setScoringFinishedPrehistoric(const bool = true); - - // Mars scoring - void setScoringThrownByRobot(const bool = true); - void setScoringGotMarsCard(const bool = true); - void setScoringSawMarsKiosk(const bool = true); - void setScoringSawTransportMap(const bool = true); - void setScoringGotCrowBar(const bool = true); - void setScoringTurnedOnTransport(const bool = true); - void setScoringGotOxygenMask(const bool = true); - void setScoringAvoidedRobot(const bool = true); - void setScoringActivatedPlatform(const bool = true); - void setScoringUsedLiquidNitrogen(const bool = true); - void setScoringUsedCrowBar(const bool = true); - void setScoringFoundCardBomb(const bool = true); - void setScoringDisarmedCardBomb(const bool = true); - void setScoringGotCardBomb(const bool = true); - void setScoringThreadedMaze(const bool = true); - void setScoringThreadedGearRoom(const bool = true); - void setScoringEnteredShuttle(const bool = true); - void setScoringEnteredLaunchTube(const bool = true); - void setScoringStoppedRobotsShuttle(const bool = true); - void setScoringGotMarsOpMemChip(const bool = true); - void setScoringFinishedMars(const bool = true); - - // Norad scoring - void setScoringSawSecurityMonitor(const bool = true); - void setScoringFilledOxygenCanister(const bool = true); - void setScoringFilledArgonCanister(const bool = true); - void setScoringSawUnconsciousOperator(const bool = true); - void setScoringWentThroughPressureDoor(const bool = true); - void setScoringPreppedSub(const bool = true); - void setScoringEnteredSub(const bool = true); - void setScoringExitedSub(const bool = true); - void setScoringSawRobotAt54North(const bool = true); - void setScoringPlayedWithClaw(const bool = true); - void setScoringUsedRetinalChip(const bool = true); - void setScoringFinishedGlobeGame(const bool = true); - void setScoringStoppedNoradRobot(const bool = true); - void setScoringGotNoradOpMemChip(const bool = true); - void setScoringFinishedNorad(const bool = true); - - // WSC scoring - void setScoringRemovedDart(const bool = true); - void setScoringAnalyzedDart(const bool = true); - void setScoringBuiltAntidote(const bool = true); - void setScoringGotSinclairKey(const bool = true); - void setScoringGotArgonCanister(const bool = true); - void setScoringGotNitrogenCanister(const bool = true); - void setScoringPlayedWithMessages(const bool = true); - void setScoringSawMorphExperiment(const bool = true); - void setScoringEnteredSinclairOffice(const bool = true); - void setScoringSawBrochure(const bool = true); - void setScoringSawSinclairEntry1(const bool = true); - void setScoringSawSinclairEntry2(const bool = true); - void setScoringSawSinclairEntry3(const bool = true); - void setScoringSawWSCDirectory(const bool = true); - void setScoringUsedCrowBarInWSC(const bool = true); - void setScoringFinishedPlasmaDodge(const bool = true); - void setScoringOpenedCatwalk(const bool = true); - void setScoringStoppedWSCRobot(const bool = true); - void setScoringGotWSCOpMemChip(const bool = true); - void setScoringFinishedWSC(const bool = true); - - // Gandhi scoring - void setScoringMarsGandhi(const bool = true); - void setScoringNoradGandhi(const bool = true); - void setScoringWSCGandhi(const bool = true); - - // Scoring "Get" functions. - bool getScoringSawINN(); - bool getScoringTookShower(); - bool getScoringFixedHair(); - bool getScoringGotKeyCard(); - bool getScoringReadPaper(); - bool getScoringLookThroughTelescope(); - bool getScoringSawCaldoriaKiosk(); - bool getScoringGoToTSA(); - bool getScoringEnterTSA(); - bool getScoringSawBust1(); - bool getScoringSawBust2(); - bool getScoringSawBust3(); - bool getScoringSawBust4(); - bool getScoringSawBust5(); - bool getScoringSawBust6(); - bool getScoringSawTheory(); - bool getScoringSawBackground(); - bool getScoringSawProcedure(); - bool getScoringGotJourneymanKey(); - bool getScoringGotPegasusBiochip(); - bool getScoringGotBiosuit(); - bool getScoringGoToPrehistoric(); - bool getScoringPutLogInReader(); - bool getScoringSawCaldoriaNormal(); - bool getScoringSawCaldoriaAltered(); - bool getScoringSawNoradNormal(); - bool getScoringSawNoradAltered(); - bool getScoringSawMarsNormal(); - bool getScoringSawMarsAltered(); - bool getScoringSawWSCNormal(); - bool getScoringSawWSCAltered(); - bool getScoringWentToReadyRoom2(); - bool getScoringWentAfterSinclair(); - bool getScoringUsedCardBomb(); - bool getScoringShieldedCardBomb(); - bool getScoringStunnedSinclair(); - bool getScoringDisarmedNuke(); - bool getScoringThrewBreaker(); - bool getScoringExtendedBridge(); - bool getScoringGotHistoricalLog(); - bool getScoringFinishedPrehistoric(); - bool getScoringThrownByRobot(); - bool getScoringGotMarsCard(); - bool getScoringSawMarsKiosk(); - bool getScoringSawTransportMap(); - bool getScoringGotCrowBar(); - bool getScoringTurnedOnTransport(); - bool getScoringGotOxygenMask(); - bool getScoringAvoidedRobot(); - bool getScoringActivatedPlatform(); - bool getScoringUsedLiquidNitrogen(); - bool getScoringUsedCrowBar(); - bool getScoringFoundCardBomb(); - bool getScoringDisarmedCardBomb(); - bool getScoringGotCardBomb(); - bool getScoringThreadedMaze(); - bool getScoringThreadedGearRoom(); - bool getScoringEnteredShuttle(); - bool getScoringEnteredLaunchTube(); - bool getScoringStoppedRobotsShuttle(); - bool getScoringGotMarsOpMemChip(); - bool getScoringFinishedMars(); - bool getScoringSawSecurityMonitor(); - bool getScoringFilledOxygenCanister(); - bool getScoringFilledArgonCanister(); - bool getScoringSawUnconsciousOperator(); - bool getScoringWentThroughPressureDoor(); - bool getScoringPreppedSub(); - bool getScoringEnteredSub(); - bool getScoringExitedSub(); - bool getScoringSawRobotAt54North(); - bool getScoringPlayedWithClaw(); - bool getScoringUsedRetinalChip(); - bool getScoringFinishedGlobeGame(); - bool getScoringStoppedNoradRobot(); - bool getScoringGotNoradOpMemChip(); - bool getScoringFinishedNorad(); - bool getScoringRemovedDart(); - bool getScoringAnalyzedDart(); - bool getScoringBuiltAntidote(); - bool getScoringGotSinclairKey(); - bool getScoringGotArgonCanister(); - bool getScoringGotNitrogenCanister(); - bool getScoringPlayedWithMessages(); - bool getScoringSawMorphExperiment(); - bool getScoringEnteredSinclairOffice(); - bool getScoringSawBrochure(); - bool getScoringSawSinclairEntry1(); - bool getScoringSawSinclairEntry2(); - bool getScoringSawSinclairEntry3(); - bool getScoringSawWSCDirectory(); - bool getScoringUsedCrowBarInWSC(); - bool getScoringFinishedPlasmaDodge(); - bool getScoringOpenedCatwalk(); - bool getScoringStoppedWSCRobot(); - bool getScoringGotWSCOpMemChip(); - bool getScoringFinishedWSC(); - bool getScoringMarsGandhi(); - bool getScoringNoradGandhi(); - bool getScoringWSCGandhi(); - - GameScoreType getCaldoriaTSAScore(); - GameScoreType getPrehistoricScore(); - GameScoreType getMarsScore(); - GameScoreType getNoradScore(); - GameScoreType getWSCScore(); - GameScoreType getGandhiScore(); - GameScoreType getTotalScore(); - - void writeCaldoriaState(Common::WriteStream *stream); - void readCaldoriaState(Common::ReadStream *stream); - void resetCaldoriaState(); - - void writeTSAState(Common::WriteStream *stream); - void readTSAState(Common::ReadStream *stream); - void resetTSAState(); - - void writePrehistoricState(Common::WriteStream *stream); - void readPrehistoricState(Common::ReadStream *stream); - void resetPrehistoricState(); - - void writeNoradState(Common::WriteStream *stream); - void readNoradState(Common::ReadStream *stream); - void resetNoradState(); - - void writeMarsState(Common::WriteStream *stream); - void readMarsState(Common::ReadStream *stream); - void resetMarsState(); - - void writeWSCState(Common::WriteStream *stream); - void readWSCState(Common::ReadStream *stream); - void resetWSCState(); - - // Globals. - void setWalkthroughMode(bool); - bool getWalkthroughMode(); - void setShieldOn(bool); - bool getShieldOn(); - void setEasterEgg(bool); - bool getEasterEgg(); - void setBeenToWSC(bool value); - bool getBeenToWSC(); - void setBeenToMars(bool value); - bool getBeenToMars(); - void setBeenToNorad(bool value); - bool getBeenToNorad(); - void setWSCFinished(bool); - bool getWSCFinished(); - void setMarsFinished(bool); - bool getMarsFinished(); - void setNoradFinished(bool); - bool getNoradFinished(); - bool allTimeZonesFinished(); - void setTakenItemID(ItemID, bool); - bool isTakenItemID(ItemID); - void setTakenItem(Item *, bool); - bool isTakenItem(Item *); - - // Caldoria - void setCaldoriaFuseTimeLimit(const TimeValue); - TimeValue getCaldoriaFuseTimeLimit(); - void setCaldoriaSeenPullback(bool); - bool getCaldoriaSeenPullback(); - void setCaldoriaMadeOJ(bool); - bool getCaldoriaMadeOJ(); - void setCaldoriaWokenUp(bool); - bool getCaldoriaWokenUp(); - void setCaldoriaDidRecalibration(bool); - bool getCaldoriaDidRecalibration(); - void setCaldoriaSeenSinclairInElevator(bool); - bool getCaldoriaSeenSinclairInElevator(); - void setCaldoriaINNAnnouncing(bool); - bool getCaldoriaINNAnnouncing(); - void setCaldoriaSeenINN(bool); - bool getCaldoriaSeenINN(); - void setCaldoriaSeenMessages(bool); - bool getCaldoriaSeenMessages(); - void setCaldoriaSinclairShot(bool); - bool getCaldoriaSinclairShot(); - void setCaldoriaBombDisarmed(bool); - bool getCaldoriaBombDisarmed(); - void setCaldoriaRoofDoorOpen(bool); - bool getCaldoriaRoofDoorOpen(); - void setCaldoriaDoneHygiene(bool); - bool getCaldoriaDoneHygiene(); - void setCaldoriaSawVoiceAnalysis(bool); - bool getCaldoriaSawVoiceAnalysis(); - void setCaldoriaDoorBombed(bool); - bool getCaldoriaDoorBombed(); - void setCaldoriaGunAimed(bool); - bool getCaldoriaGunAimed(); - - // TSA - void setRipTimerTime(TimeValue); - TimeValue getRipTimerTime(); - void setTSAFuseTimeLimit(TimeValue); - TimeValue getTSAFuseTimeLimit(); - void setT0BMonitorMode(byte); - byte getT0BMonitorMode(); - void setTSAState(byte); - byte getTSAState(); - void setT0BMonitorStart(TimeValue); - TimeValue getT0BMonitorStart(); - void setTSAIDedAtDoor(bool); - bool getTSAIDedAtDoor(); - void setTSA0BZoomedIn(bool); - bool getTSA0BZoomedIn(); - void setTSAFrontDoorUnlockedOutside(bool); - bool getTSAFrontDoorUnlockedOutside(); - void setTSAFrontDoorUnlockedInside(bool); - bool getTSAFrontDoorUnlockedInside(); - void setTSASeenRobotGreeting(bool); - bool getTSASeenRobotGreeting(); - void setTSASeenTheory(bool); - bool getTSASeenTheory(); - void setTSASeenBackground(bool); - bool getTSASeenBackground(); - void setTSASeenProcedure(bool); - bool getTSASeenProcedure(); - void setTSASeenAgent3AtDoor(bool); - bool getTSASeenAgent3AtDoor(); - void setTSACommandCenterLocked(bool); - bool getTSACommandCenterLocked(); - void setTSASeenCaldoriaNormal(bool); - bool getTSASeenCaldoriaNormal(); - void setTSASeenCaldoriaAltered(bool); - bool getTSASeenCaldoriaAltered(); - void setTSASeenNoradNormal(bool); - bool getTSASeenNoradNormal(); - void setTSASeenNoradAltered(bool); - bool getTSASeenNoradAltered(); - void setTSASeenMarsNormal(bool); - bool getTSASeenMarsNormal(); - void setTSASeenMarsAltered(bool); - bool getTSASeenMarsAltered(); - void setTSASeenWSCNormal(bool); - bool getTSASeenWSCNormal(); - void setTSASeenWSCAltered(bool); - bool getTSASeenWSCAltered(); - void setTSABiosuitOn(bool); - bool getTSABiosuitOn(); - - // Prehistoric - void setPrehistoricTriedToExtendBridge(bool); - bool getPrehistoricTriedToExtendBridge(); - void setPrehistoricSeenTimeStream(bool); - bool getPrehistoricSeenTimeStream(); - void setPrehistoricSeenFlyer1(bool); - bool getPrehistoricSeenFlyer1(); - void setPrehistoricSeenFlyer2(bool); - bool getPrehistoricSeenFlyer2(); - void setPrehistoricSeenBridgeZoom(bool); - bool getPrehistoricSeenBridgeZoom(); - void setPrehistoricBreakerThrown(bool); - bool getPrehistoricBreakerThrown(); - - // Norad - void setNoradSeenTimeStream(bool); - bool getNoradSeenTimeStream(); - void setNoradGassed(bool); - bool getNoradGassed(); - void setNoradFillingStationOn(bool); - bool getNoradFillingStationOn(); - void setNoradN22MessagePlayed(bool); - bool getNoradN22MessagePlayed(); - void setNoradPlayedGlobeGame(bool); - bool getNoradPlayedGlobeGame(); - void setNoradBeatRobotWithClaw(bool); - bool getNoradBeatRobotWithClaw(); - void setNoradBeatRobotWithDoor(bool); - bool getNoradBeatRobotWithDoor(); - void setNoradRetScanGood(bool); - bool getNoradRetScanGood(); - void setNoradWaitingForLaser(bool); - bool getNoradWaitingForLaser(); - void setNoradSubRoomPressure(uint16); - uint16 getNoradSubRoomPressure(); - void setNoradSubPrepState(NoradSubPrepState); - NoradSubPrepState getNoradSubPrepState(); - void setNoradArrivedFromSub(bool); - bool getNoradArrivedFromSub(); - - // Mars - void setMarsSeenTimeStream(bool); - bool getMarsSeenTimeStream(); - void setMarsHeardUpperPodMessage(bool); - bool getMarsHeardUpperPodMessage(); - void setMarsRobotThrownPlayer(bool); - bool getMarsRobotThrownPlayer(); - void setMarsHeardCheckInMessage(bool); - bool getMarsHeardCheckInMessage(); - void setMarsPodAtUpperPlatform(bool); - bool getMarsPodAtUpperPlatform(); - void setMarsSeenThermalScan(bool); - bool getMarsSeenThermalScan(); - void setMarsArrivedBelow(bool); - bool getMarsArrivedBelow(); - void setMarsSeenRobotAtReactor(bool); - bool getMarsSeenRobotAtReactor(); - void setMarsAvoidedReactorRobot(bool); - bool getMarsAvoidedReactorRobot(); - void setMarsInAirlock(bool); - bool getMarsInAirlock(); - void setMarsAirlockOpen(bool); - bool getMarsAirlockOpen(); - void setMarsMaskOnFiller(bool); - bool getMarsMaskOnFiller(); - void setMarsLockFrozen(bool); - bool getMarsLockFrozen(); - void setMarsLockBroken(bool); - bool getMarsLockBroken(); - void setMarsMazeDoorPair1(bool); - bool getMarsMazeDoorPair1(); - void setMarsMazeDoorPair2(bool); - bool getMarsMazeDoorPair2(); - void setMarsMazeDoorPair3(bool); - bool getMarsMazeDoorPair3(); - void setMarsSawRobotLeave(bool); - bool getMarsSawRobotLeave(); - void setMarsSecurityDown(bool); - bool getMarsSecurityDown(); - void setMarsFinishedCanyonChase(bool); - bool getMarsFinishedCanyonChase(); - void setMarsThreadedMaze(bool); - bool getMarsThreadedMaze(); - void setMarsHitRobotWithCannon(bool); - bool getMarsHitRobotWithCannon(); - void setMarsReadyForShuttleTransport(bool); - bool getMarsReadyForShuttleTransport(); - - // WSC - void setWSCSeenTimeStream(bool); - bool getWSCSeenTimeStream(); - void setWSCPoisoned(bool); - bool getWSCPoisoned(); - void setWSCAnsweredAboutDart(bool); - bool getWSCAnsweredAboutDart(); - void setWSCRemovedDart(bool); - bool getWSCRemovedDart(); - void setWSCAnalyzerOn(bool); - bool getWSCAnalyzerOn(); - void setWSCDartInAnalyzer(bool); - bool getWSCDartInAnalyzer(); - void setWSCAnalyzedDart(bool); - bool getWSCAnalyzedDart(); - void setWSCSawMorph(bool); - bool getWSCSawMorph(); - void setWSCDesignedAntidote(bool); - bool getWSCDesignedAntidote(); - void setWSCPickedUpAntidote(bool); - bool getWSCPickedUpAntidote(); - void setWSCOfficeMessagesOpen(bool); - bool getWSCOfficeMessagesOpen(); - void setWSCSeenNerd(bool); - bool getWSCSeenNerd(); - void setWSCHeardPage1(bool); - bool getWSCHeardPage1(); - void setWSCHeardPage2(bool); - bool getWSCHeardPage2(); - void setWSCHeardCheckIn(bool); - bool getWSCHeardCheckIn(); - void setWSCDidPlasmaDodge(bool); - bool getWSCDidPlasmaDodge(); - void setWSCSeenSinclairLecture(bool); - bool getWSCSeenSinclairLecture(); - void setWSCBeenAtWSC93(bool); - bool getWSCBeenAtWSC93(); - void setWSCCatwalkDark(bool); - bool getWSCCatwalkDark(); - void setWSCRobotDead(bool); - bool getWSCRobotDead(); - void setWSCRobotGone(bool); - bool getWSCRobotGone(); + void setScoringSawCaldoriaKiosk(const bool = true); + void setScoringGoToTSA(const bool = true); + void setScoringEnterTSA(const bool = true); + void setScoringSawBust1(const bool = true); + void setScoringSawBust2(const bool = true); + void setScoringSawBust3(const bool = true); + void setScoringSawBust4(const bool = true); + void setScoringSawBust5(const bool = true); + void setScoringSawBust6(const bool = true); + void setScoringSawTheory(const bool = true); + void setScoringSawBackground(const bool = true); + void setScoringSawProcedure(const bool = true); + void setScoringGotJourneymanKey(const bool = true); + void setScoringGotPegasusBiochip(const bool = true); + void setScoringGotBiosuit(const bool = true); + void setScoringGoToPrehistoric(const bool = true); + void setScoringPutLogInReader(const bool = true); + void setScoringSawCaldoriaNormal(const bool = true); + void setScoringSawCaldoriaAltered(const bool = true); + void setScoringSawNoradNormal(const bool = true); + void setScoringSawNoradAltered(const bool = true); + void setScoringSawMarsNormal(const bool = true); + void setScoringSawMarsAltered(const bool = true); + void setScoringSawWSCNormal(const bool = true); + void setScoringSawWSCAltered(const bool = true); + void setScoringWentToReadyRoom2(const bool = true); + void setScoringWentAfterSinclair(const bool = true); + void setScoringUsedCardBomb(const bool = true); + void setScoringShieldedCardBomb(const bool = true); + void setScoringStunnedSinclair(const bool = true); + void setScoringDisarmedNuke(const bool = true); + + // Prehistoric scoring + void setScoringThrewBreaker(const bool = true); + void setScoringExtendedBridge(const bool = true); + void setScoringGotHistoricalLog(const bool = true); + void setScoringFinishedPrehistoric(const bool = true); + + // Mars scoring + void setScoringThrownByRobot(const bool = true); + void setScoringGotMarsCard(const bool = true); + void setScoringSawMarsKiosk(const bool = true); + void setScoringSawTransportMap(const bool = true); + void setScoringGotCrowBar(const bool = true); + void setScoringTurnedOnTransport(const bool = true); + void setScoringGotOxygenMask(const bool = true); + void setScoringAvoidedRobot(const bool = true); + void setScoringActivatedPlatform(const bool = true); + void setScoringUsedLiquidNitrogen(const bool = true); + void setScoringUsedCrowBar(const bool = true); + void setScoringFoundCardBomb(const bool = true); + void setScoringDisarmedCardBomb(const bool = true); + void setScoringGotCardBomb(const bool = true); + void setScoringThreadedMaze(const bool = true); + void setScoringThreadedGearRoom(const bool = true); + void setScoringEnteredShuttle(const bool = true); + void setScoringEnteredLaunchTube(const bool = true); + void setScoringStoppedRobotsShuttle(const bool = true); + void setScoringGotMarsOpMemChip(const bool = true); + void setScoringFinishedMars(const bool = true); + + // Norad scoring + void setScoringSawSecurityMonitor(const bool = true); + void setScoringFilledOxygenCanister(const bool = true); + void setScoringFilledArgonCanister(const bool = true); + void setScoringSawUnconsciousOperator(const bool = true); + void setScoringWentThroughPressureDoor(const bool = true); + void setScoringPreppedSub(const bool = true); + void setScoringEnteredSub(const bool = true); + void setScoringExitedSub(const bool = true); + void setScoringSawRobotAt54North(const bool = true); + void setScoringPlayedWithClaw(const bool = true); + void setScoringUsedRetinalChip(const bool = true); + void setScoringFinishedGlobeGame(const bool = true); + void setScoringStoppedNoradRobot(const bool = true); + void setScoringGotNoradOpMemChip(const bool = true); + void setScoringFinishedNorad(const bool = true); + + // WSC scoring + void setScoringRemovedDart(const bool = true); + void setScoringAnalyzedDart(const bool = true); + void setScoringBuiltAntidote(const bool = true); + void setScoringGotSinclairKey(const bool = true); + void setScoringGotArgonCanister(const bool = true); + void setScoringGotNitrogenCanister(const bool = true); + void setScoringPlayedWithMessages(const bool = true); + void setScoringSawMorphExperiment(const bool = true); + void setScoringEnteredSinclairOffice(const bool = true); + void setScoringSawBrochure(const bool = true); + void setScoringSawSinclairEntry1(const bool = true); + void setScoringSawSinclairEntry2(const bool = true); + void setScoringSawSinclairEntry3(const bool = true); + void setScoringSawWSCDirectory(const bool = true); + void setScoringUsedCrowBarInWSC(const bool = true); + void setScoringFinishedPlasmaDodge(const bool = true); + void setScoringOpenedCatwalk(const bool = true); + void setScoringStoppedWSCRobot(const bool = true); + void setScoringGotWSCOpMemChip(const bool = true); + void setScoringFinishedWSC(const bool = true); + + // Gandhi scoring + void setScoringMarsGandhi(const bool = true); + void setScoringNoradGandhi(const bool = true); + void setScoringWSCGandhi(const bool = true); + + // Scoring "Get" functions. + bool getScoringSawINN(); + bool getScoringTookShower(); + bool getScoringFixedHair(); + bool getScoringGotKeyCard(); + bool getScoringReadPaper(); + bool getScoringLookThroughTelescope(); + bool getScoringSawCaldoriaKiosk(); + bool getScoringGoToTSA(); + bool getScoringEnterTSA(); + bool getScoringSawBust1(); + bool getScoringSawBust2(); + bool getScoringSawBust3(); + bool getScoringSawBust4(); + bool getScoringSawBust5(); + bool getScoringSawBust6(); + bool getScoringSawTheory(); + bool getScoringSawBackground(); + bool getScoringSawProcedure(); + bool getScoringGotJourneymanKey(); + bool getScoringGotPegasusBiochip(); + bool getScoringGotBiosuit(); + bool getScoringGoToPrehistoric(); + bool getScoringPutLogInReader(); + bool getScoringSawCaldoriaNormal(); + bool getScoringSawCaldoriaAltered(); + bool getScoringSawNoradNormal(); + bool getScoringSawNoradAltered(); + bool getScoringSawMarsNormal(); + bool getScoringSawMarsAltered(); + bool getScoringSawWSCNormal(); + bool getScoringSawWSCAltered(); + bool getScoringWentToReadyRoom2(); + bool getScoringWentAfterSinclair(); + bool getScoringUsedCardBomb(); + bool getScoringShieldedCardBomb(); + bool getScoringStunnedSinclair(); + bool getScoringDisarmedNuke(); + bool getScoringThrewBreaker(); + bool getScoringExtendedBridge(); + bool getScoringGotHistoricalLog(); + bool getScoringFinishedPrehistoric(); + bool getScoringThrownByRobot(); + bool getScoringGotMarsCard(); + bool getScoringSawMarsKiosk(); + bool getScoringSawTransportMap(); + bool getScoringGotCrowBar(); + bool getScoringTurnedOnTransport(); + bool getScoringGotOxygenMask(); + bool getScoringAvoidedRobot(); + bool getScoringActivatedPlatform(); + bool getScoringUsedLiquidNitrogen(); + bool getScoringUsedCrowBar(); + bool getScoringFoundCardBomb(); + bool getScoringDisarmedCardBomb(); + bool getScoringGotCardBomb(); + bool getScoringThreadedMaze(); + bool getScoringThreadedGearRoom(); + bool getScoringEnteredShuttle(); + bool getScoringEnteredLaunchTube(); + bool getScoringStoppedRobotsShuttle(); + bool getScoringGotMarsOpMemChip(); + bool getScoringFinishedMars(); + bool getScoringSawSecurityMonitor(); + bool getScoringFilledOxygenCanister(); + bool getScoringFilledArgonCanister(); + bool getScoringSawUnconsciousOperator(); + bool getScoringWentThroughPressureDoor(); + bool getScoringPreppedSub(); + bool getScoringEnteredSub(); + bool getScoringExitedSub(); + bool getScoringSawRobotAt54North(); + bool getScoringPlayedWithClaw(); + bool getScoringUsedRetinalChip(); + bool getScoringFinishedGlobeGame(); + bool getScoringStoppedNoradRobot(); + bool getScoringGotNoradOpMemChip(); + bool getScoringFinishedNorad(); + bool getScoringRemovedDart(); + bool getScoringAnalyzedDart(); + bool getScoringBuiltAntidote(); + bool getScoringGotSinclairKey(); + bool getScoringGotArgonCanister(); + bool getScoringGotNitrogenCanister(); + bool getScoringPlayedWithMessages(); + bool getScoringSawMorphExperiment(); + bool getScoringEnteredSinclairOffice(); + bool getScoringSawBrochure(); + bool getScoringSawSinclairEntry1(); + bool getScoringSawSinclairEntry2(); + bool getScoringSawSinclairEntry3(); + bool getScoringSawWSCDirectory(); + bool getScoringUsedCrowBarInWSC(); + bool getScoringFinishedPlasmaDodge(); + bool getScoringOpenedCatwalk(); + bool getScoringStoppedWSCRobot(); + bool getScoringGotWSCOpMemChip(); + bool getScoringFinishedWSC(); + bool getScoringMarsGandhi(); + bool getScoringNoradGandhi(); + bool getScoringWSCGandhi(); + + GameScoreType getCaldoriaTSAScore(); + GameScoreType getPrehistoricScore(); + GameScoreType getMarsScore(); + GameScoreType getNoradScore(); + GameScoreType getWSCScore(); + GameScoreType getGandhiScore(); + GameScoreType getTotalScore(); + + void writeCaldoriaState(Common::WriteStream *stream); + void readCaldoriaState(Common::ReadStream *stream); + void resetCaldoriaState(); + + void writeTSAState(Common::WriteStream *stream); + void readTSAState(Common::ReadStream *stream); + void resetTSAState(); + + void writePrehistoricState(Common::WriteStream *stream); + void readPrehistoricState(Common::ReadStream *stream); + void resetPrehistoricState(); + + void writeNoradState(Common::WriteStream *stream); + void readNoradState(Common::ReadStream *stream); + void resetNoradState(); + + void writeMarsState(Common::WriteStream *stream); + void readMarsState(Common::ReadStream *stream); + void resetMarsState(); + + void writeWSCState(Common::WriteStream *stream); + void readWSCState(Common::ReadStream *stream); + void resetWSCState(); + + // Globals. + void setWalkthroughMode(bool); + bool getWalkthroughMode(); + void setShieldOn(bool); + bool getShieldOn(); + void setEasterEgg(bool); + bool getEasterEgg(); + void setBeenToWSC(bool value); + bool getBeenToWSC(); + void setBeenToMars(bool value); + bool getBeenToMars(); + void setBeenToNorad(bool value); + bool getBeenToNorad(); + void setWSCFinished(bool); + bool getWSCFinished(); + void setMarsFinished(bool); + bool getMarsFinished(); + void setNoradFinished(bool); + bool getNoradFinished(); + bool allTimeZonesFinished(); + void setTakenItemID(ItemID, bool); + bool isTakenItemID(ItemID); + void setTakenItem(Item *, bool); + bool isTakenItem(Item *); + + // Caldoria + void setCaldoriaFuseTimeLimit(const TimeValue); + TimeValue getCaldoriaFuseTimeLimit(); + void setCaldoriaSeenPullback(bool); + bool getCaldoriaSeenPullback(); + void setCaldoriaMadeOJ(bool); + bool getCaldoriaMadeOJ(); + void setCaldoriaWokenUp(bool); + bool getCaldoriaWokenUp(); + void setCaldoriaDidRecalibration(bool); + bool getCaldoriaDidRecalibration(); + void setCaldoriaSeenSinclairInElevator(bool); + bool getCaldoriaSeenSinclairInElevator(); + void setCaldoriaINNAnnouncing(bool); + bool getCaldoriaINNAnnouncing(); + void setCaldoriaSeenINN(bool); + bool getCaldoriaSeenINN(); + void setCaldoriaSeenMessages(bool); + bool getCaldoriaSeenMessages(); + void setCaldoriaSinclairShot(bool); + bool getCaldoriaSinclairShot(); + void setCaldoriaBombDisarmed(bool); + bool getCaldoriaBombDisarmed(); + void setCaldoriaRoofDoorOpen(bool); + bool getCaldoriaRoofDoorOpen(); + void setCaldoriaDoneHygiene(bool); + bool getCaldoriaDoneHygiene(); + void setCaldoriaSawVoiceAnalysis(bool); + bool getCaldoriaSawVoiceAnalysis(); + void setCaldoriaDoorBombed(bool); + bool getCaldoriaDoorBombed(); + void setCaldoriaGunAimed(bool); + bool getCaldoriaGunAimed(); + + // TSA + void setRipTimerTime(TimeValue); + TimeValue getRipTimerTime(); + void setTSAFuseTimeLimit(TimeValue); + TimeValue getTSAFuseTimeLimit(); + void setT0BMonitorMode(byte); + byte getT0BMonitorMode(); + void setTSAState(byte); + byte getTSAState(); + void setT0BMonitorStart(TimeValue); + TimeValue getT0BMonitorStart(); + void setTSAIDedAtDoor(bool); + bool getTSAIDedAtDoor(); + void setTSA0BZoomedIn(bool); + bool getTSA0BZoomedIn(); + void setTSAFrontDoorUnlockedOutside(bool); + bool getTSAFrontDoorUnlockedOutside(); + void setTSAFrontDoorUnlockedInside(bool); + bool getTSAFrontDoorUnlockedInside(); + void setTSASeenRobotGreeting(bool); + bool getTSASeenRobotGreeting(); + void setTSASeenTheory(bool); + bool getTSASeenTheory(); + void setTSASeenBackground(bool); + bool getTSASeenBackground(); + void setTSASeenProcedure(bool); + bool getTSASeenProcedure(); + void setTSASeenAgent3AtDoor(bool); + bool getTSASeenAgent3AtDoor(); + void setTSACommandCenterLocked(bool); + bool getTSACommandCenterLocked(); + void setTSASeenCaldoriaNormal(bool); + bool getTSASeenCaldoriaNormal(); + void setTSASeenCaldoriaAltered(bool); + bool getTSASeenCaldoriaAltered(); + void setTSASeenNoradNormal(bool); + bool getTSASeenNoradNormal(); + void setTSASeenNoradAltered(bool); + bool getTSASeenNoradAltered(); + void setTSASeenMarsNormal(bool); + bool getTSASeenMarsNormal(); + void setTSASeenMarsAltered(bool); + bool getTSASeenMarsAltered(); + void setTSASeenWSCNormal(bool); + bool getTSASeenWSCNormal(); + void setTSASeenWSCAltered(bool); + bool getTSASeenWSCAltered(); + void setTSABiosuitOn(bool); + bool getTSABiosuitOn(); + + // Prehistoric + void setPrehistoricTriedToExtendBridge(bool); + bool getPrehistoricTriedToExtendBridge(); + void setPrehistoricSeenTimeStream(bool); + bool getPrehistoricSeenTimeStream(); + void setPrehistoricSeenFlyer1(bool); + bool getPrehistoricSeenFlyer1(); + void setPrehistoricSeenFlyer2(bool); + bool getPrehistoricSeenFlyer2(); + void setPrehistoricSeenBridgeZoom(bool); + bool getPrehistoricSeenBridgeZoom(); + void setPrehistoricBreakerThrown(bool); + bool getPrehistoricBreakerThrown(); + + // Norad + void setNoradSeenTimeStream(bool); + bool getNoradSeenTimeStream(); + void setNoradGassed(bool); + bool getNoradGassed(); + void setNoradFillingStationOn(bool); + bool getNoradFillingStationOn(); + void setNoradN22MessagePlayed(bool); + bool getNoradN22MessagePlayed(); + void setNoradPlayedGlobeGame(bool); + bool getNoradPlayedGlobeGame(); + void setNoradBeatRobotWithClaw(bool); + bool getNoradBeatRobotWithClaw(); + void setNoradBeatRobotWithDoor(bool); + bool getNoradBeatRobotWithDoor(); + void setNoradRetScanGood(bool); + bool getNoradRetScanGood(); + void setNoradWaitingForLaser(bool); + bool getNoradWaitingForLaser(); + void setNoradSubRoomPressure(uint16); + uint16 getNoradSubRoomPressure(); + void setNoradSubPrepState(NoradSubPrepState); + NoradSubPrepState getNoradSubPrepState(); + void setNoradArrivedFromSub(bool); + bool getNoradArrivedFromSub(); + + // Mars + void setMarsSeenTimeStream(bool); + bool getMarsSeenTimeStream(); + void setMarsHeardUpperPodMessage(bool); + bool getMarsHeardUpperPodMessage(); + void setMarsRobotThrownPlayer(bool); + bool getMarsRobotThrownPlayer(); + void setMarsHeardCheckInMessage(bool); + bool getMarsHeardCheckInMessage(); + void setMarsPodAtUpperPlatform(bool); + bool getMarsPodAtUpperPlatform(); + void setMarsSeenThermalScan(bool); + bool getMarsSeenThermalScan(); + void setMarsArrivedBelow(bool); + bool getMarsArrivedBelow(); + void setMarsSeenRobotAtReactor(bool); + bool getMarsSeenRobotAtReactor(); + void setMarsAvoidedReactorRobot(bool); + bool getMarsAvoidedReactorRobot(); + void setMarsInAirlock(bool); + bool getMarsInAirlock(); + void setMarsAirlockOpen(bool); + bool getMarsAirlockOpen(); + void setMarsMaskOnFiller(bool); + bool getMarsMaskOnFiller(); + void setMarsLockFrozen(bool); + bool getMarsLockFrozen(); + void setMarsLockBroken(bool); + bool getMarsLockBroken(); + void setMarsMazeDoorPair1(bool); + bool getMarsMazeDoorPair1(); + void setMarsMazeDoorPair2(bool); + bool getMarsMazeDoorPair2(); + void setMarsMazeDoorPair3(bool); + bool getMarsMazeDoorPair3(); + void setMarsSawRobotLeave(bool); + bool getMarsSawRobotLeave(); + void setMarsSecurityDown(bool); + bool getMarsSecurityDown(); + void setMarsFinishedCanyonChase(bool); + bool getMarsFinishedCanyonChase(); + void setMarsThreadedMaze(bool); + bool getMarsThreadedMaze(); + void setMarsHitRobotWithCannon(bool); + bool getMarsHitRobotWithCannon(); + void setMarsReadyForShuttleTransport(bool); + bool getMarsReadyForShuttleTransport(); + + // WSC + void setWSCSeenTimeStream(bool); + bool getWSCSeenTimeStream(); + void setWSCPoisoned(bool); + bool getWSCPoisoned(); + void setWSCAnsweredAboutDart(bool); + bool getWSCAnsweredAboutDart(); + void setWSCRemovedDart(bool); + bool getWSCRemovedDart(); + void setWSCAnalyzerOn(bool); + bool getWSCAnalyzerOn(); + void setWSCDartInAnalyzer(bool); + bool getWSCDartInAnalyzer(); + void setWSCAnalyzedDart(bool); + bool getWSCAnalyzedDart(); + void setWSCSawMorph(bool); + bool getWSCSawMorph(); + void setWSCDesignedAntidote(bool); + bool getWSCDesignedAntidote(); + void setWSCPickedUpAntidote(bool); + bool getWSCPickedUpAntidote(); + void setWSCOfficeMessagesOpen(bool); + bool getWSCOfficeMessagesOpen(); + void setWSCSeenNerd(bool); + bool getWSCSeenNerd(); + void setWSCHeardPage1(bool); + bool getWSCHeardPage1(); + void setWSCHeardPage2(bool); + bool getWSCHeardPage2(); + void setWSCHeardCheckIn(bool); + bool getWSCHeardCheckIn(); + void setWSCDidPlasmaDodge(bool); + bool getWSCDidPlasmaDodge(); + void setWSCSeenSinclairLecture(bool); + bool getWSCSeenSinclairLecture(); + void setWSCBeenAtWSC93(bool); + bool getWSCBeenAtWSC93(); + void setWSCCatwalkDark(bool); + bool getWSCCatwalkDark(); + void setWSCRobotDead(bool); + bool getWSCRobotDead(); + void setWSCRobotGone(bool); + bool getWSCRobotGone(); protected: friend class Common::Singleton<SingletonBaseType>; @@ -845,7 +845,7 @@ private: RoomID _currentRoom; DirectionConstant _currentDirection; NeighborhoodID _nexNeighborhoodID; - RoomID _nexRoomID; + RoomID _nextRoomID; DirectionConstant _nextDirection; NeighborhoodID _lastNeighborhood; RoomID _lastRoom; diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp index bb5167b86e..d0b8b69b5b 100755 --- a/engines/pegasus/input.cpp +++ b/engines/pegasus/input.cpp @@ -139,7 +139,7 @@ void InputDevice::getInput(Input &input, const InputBits filter) { input.setAltDown(altDown); } -// Wait until the input device stops returning input allowed by filter... +// Wait until the input device stops returning input allowed by filter... void InputDevice::waitInput(const InputBits filter) { if (filter != 0) { for (;;) { diff --git a/engines/pegasus/input.h b/engines/pegasus/input.h index 1aae16c062..57d5f93df1 100755 --- a/engines/pegasus/input.h +++ b/engines/pegasus/input.h @@ -409,10 +409,10 @@ public: virtual bool releaseInputFocus() { return true; } virtual void grabInputFocus() {} - // This returns bits set for what kinds of input to accept. + // This returns bits set for what kinds of input to accept. virtual InputBits getInputFilter(); - // This returns bits defining what input constitutes a "click." + // This returns bits defining what input constitutes a "click." virtual InputBits getClickFilter(); virtual void allowInput(const bool allow) { _allowInput = allow; } diff --git a/engines/pegasus/items/inventory.cpp b/engines/pegasus/items/inventory.cpp index e30fcac368..16cced3267 100755 --- a/engines/pegasus/items/inventory.cpp +++ b/engines/pegasus/items/inventory.cpp @@ -40,7 +40,7 @@ Inventory::~Inventory() { void Inventory::setWeightLimit(WeightType limit) { _weightLimit = limit; - // *** What to do if the new weight limit is greater than the current weight? + // *** What to do if the new weight limit is greater than the current weight? } WeightType Inventory::getWeight() { @@ -52,7 +52,7 @@ WeightType Inventory::getWeight() { return result; } -// If the item already belongs, just return kInventoryOK. +// If the item already belongs, just return kInventoryOK. InventoryResult Inventory::addItem(Item *item) { if (itemInInventory(item)) return kInventoryOK; @@ -134,7 +134,7 @@ Item *Inventory::findItemByID(ItemID id) { return _inventoryList.findItemByID(id); } -// Return -1 if not found. +// Return -1 if not found. int32 Inventory::findIndexOf(Item *item) { uint32 i = 0; @@ -145,7 +145,7 @@ int32 Inventory::findIndexOf(Item *item) { return -1; } -// Return -1 if not found. +// Return -1 if not found. int32 Inventory::findIndexOf(ItemID id) { uint32 i = 0; diff --git a/engines/pegasus/items/inventory.h b/engines/pegasus/items/inventory.h index db872b1990..099ba52ba7 100755 --- a/engines/pegasus/items/inventory.h +++ b/engines/pegasus/items/inventory.h @@ -33,11 +33,11 @@ namespace Pegasus { class Item; -// Inventories have a "current item". This item is the default item the player can -// use. In a text adventure system, the current item would be "it", as in -// "Hit the troll with it," where "it" would refer to some weapon which is the current -// item. In a graphic adventure, the current item would be the item the user selects -// to use with the mouse or other pointing device. +// Inventories have a "current item". This item is the default item the player can +// use. In a text adventure system, the current item would be "it", as in +// "Hit the troll with it," where "it" would refer to some weapon which is the current +// item. In a graphic adventure, the current item would be the item the user selects +// to use with the mouse or other pointing device. class Inventory { public: diff --git a/engines/pegasus/items/inventorypicture.cpp b/engines/pegasus/items/inventorypicture.cpp index 7be095c499..1f887773d6 100755 --- a/engines/pegasus/items/inventorypicture.cpp +++ b/engines/pegasus/items/inventorypicture.cpp @@ -171,7 +171,7 @@ void InventoryPicture::panelUp() { allowInput(true); } -// Must ensure that the picture matches the _inventory member variable. +// Must ensure that the picture matches the _inventory member variable. void InventoryPicture::activateInventoryPicture() { if (_active) return; diff --git a/engines/pegasus/items/item.cpp b/engines/pegasus/items/item.cpp index 83e3b0231e..a49bb4a466 100755 --- a/engines/pegasus/items/item.cpp +++ b/engines/pegasus/items/item.cpp @@ -217,7 +217,7 @@ TimeValue Item::getSharedAreaTime() const { return time; } -// Must affect images in shared area. +// Must affect images in shared area. void Item::select() { _isSelected = true; diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h index b50f8503ef..efcf24100c 100755 --- a/engines/pegasus/items/item.h +++ b/engines/pegasus/items/item.h @@ -40,7 +40,7 @@ namespace Common { namespace Pegasus { -// JMPItemInfo contains resource data used by all Items. +// JMPItemInfo contains resource data used by all Items. struct JMPItemInfo { TimeValue infoLeftTime; @@ -50,23 +50,21 @@ struct JMPItemInfo { uint32 dragSpriteUsedID; }; -// ItemStateEntry contains a single state/TimeValue pair. The TimeValue is -// the time value to set the shared area movie that corresponds with the given -// state of an inventory item. +// ItemStateEntry contains a single state/TimeValue pair. The TimeValue is +// the time value to set the shared area movie that corresponds with the given +// state of an inventory item. struct ItemStateEntry { ItemState itemState; TimeValue itemTime; }; -// ItemStateInfoHandle is an array of ItemStateEntry. - struct ItemStateInfo { - uint16 numEntries; // For easy ResEdit access + uint16 numEntries; // For easy ResEdit access ItemStateEntry *entries; }; -// ItemExtraEntry +// ItemExtraEntry static const short kLeftAreaExtra = 0; static const short kMiddleAreaExtra = 1; @@ -79,16 +77,14 @@ struct ItemExtraEntry { TimeValue extraStop; }; -// tItemExtraInfoHandle is an array of tItemExtraEntry. - struct ItemExtraInfo { - uint16 numEntries; // For easy ResEdit access + uint16 numEntries; // For easy ResEdit access ItemExtraEntry *entries; }; -// Inventory info resource type and ID: -// Individual inventory items are stored in these resource types. -// Resource ID is item ID + kItemBaseResID. +// Inventory info resource type and ID: +// Individual inventory items are stored in these resource types. +// Resource ID is item ID + kItemBaseResID. static const uint32 kItemInfoResType = MKTAG('I', 't', 'e', 'm'); // JMPItemInfoHandle static const uint32 kLeftAreaInfoResType = MKTAG('L', 'e', 'f', 't'); // ItemStateInfoHandle @@ -98,7 +94,7 @@ static const uint32 kItemExtraInfoResType = MKTAG('I', 'X', 't', 'r'); // ItemE static const uint16 kItemBaseResID = 128; -// Item IDs. +// Item IDs. static const ItemID kAirMask = 7; static const ItemID kAntidote = 8; @@ -119,7 +115,7 @@ static const ItemID kSinclairKey = 22; static const ItemID kStunGun = 23; static const ItemID kArgonPickup = 24; -// Biochips. +// Biochips. static const ItemID kAIBiochip = 0; static const ItemID kInterfaceBiochip = 1; @@ -131,7 +127,7 @@ static const ItemID kShieldBiochip = 6; static const ItemID kNumItems = 25; -// Item States. +// Item States. static const ItemState kAI000 = 0; static const ItemState kAI005 = 1; @@ -253,7 +249,7 @@ static const ItemState kNitrogenEmpty = 116; static const ItemState kNitrogenFull = 117; static const ItemState kFullGlass = 118; -// Extra IDs. +// Extra IDs. static const uint32 kRetinalScanSearching = 0; static const uint32 kRetinalScanActivated = 1; @@ -323,8 +319,8 @@ public: deselect -- called when this item is no longer current. activate -- called on the current item when the panel is closed. */ - // In an override of these three member functions, you must call the inherited - // member functions. + // In an override of these three member functions, you must call the inherited + // member functions. virtual void select(); virtual void deselect(); virtual bool isSelected() { return _isSelected; } @@ -336,8 +332,8 @@ public: virtual void removedFromInventory() {} virtual void dropped() {} - // Called when the shared area is taken by another item, but this item is still - // selected. + // Called when the shared area is taken by another item, but this item is still + // selected. virtual void giveUpSharedArea() {} virtual void takeSharedArea() {} diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp index b1763a5b38..4f8947b7d7 100755 --- a/engines/pegasus/menu.cpp +++ b/engines/pegasus/menu.cpp @@ -142,7 +142,7 @@ static const CoordType kMainMenuQuitTop = 428; static const CoordType kMainMenuQuitSelectLeft = 152; static const CoordType kMainMenuQuitSelectTop = 424; -// Never set the current input handler to the MainMenu. +// Never set the current input handler to the MainMenu. MainMenu::MainMenu() : GameMenu(kMainMenuID), _menuBackground(0), _overviewButton(0), _restoreButton(0), _adventureButton(0), _walkthroughButton(0), _startButton(0), _creditsButton(0), _quitButton(0), _largeSelect(0), _smallSelect(0) { @@ -447,9 +447,9 @@ static const TimeValue kOriginalTeamTime = 3000; static const TimeValue kTalentTime = 4440; static const TimeValue kOtherTitlesTime = 4680; -static const TimeValue kFrameIncrement = 120; // Three frames... +static const TimeValue kFrameIncrement = 120; // Three frames... -// Never set the current input handler to the CreditsMenu. +// Never set the current input handler to the CreditsMenu. CreditsMenu::CreditsMenu() : GameMenu(kCreditsMenuID), _menuBackground(0), _creditsMovie(0), _mainMenuButton(0), _largeSelect(0), _smallSelect(0) { @@ -979,7 +979,7 @@ static const CoordType kQuitTop = kPauseTop + 302; static const CoordType kQuitSelectLeft = kPauseLeft - 44; static const CoordType kQuitSelectTop = kPauseTop + 297; -// These are relative to the pause background. +// These are relative to the pause background. static const CoordType kPauseScoreLeft = 130; static const CoordType kPauseScoreTop = 34; static const CoordType kPauseScoreRight = kPauseScoreLeft + 108; diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp index 14e6f25c39..324a86f2de 100755 --- a/engines/pegasus/movie.cpp +++ b/engines/pegasus/movie.cpp @@ -41,7 +41,7 @@ Movie::~Movie() { releaseMovie(); } -// *** Make sure this will stop displaying the movie. +// *** Make sure this will stop displaying the movie. void Movie::releaseMovie() { if (_video) { diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp index 1ea6e12f85..a4beecde9b 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp @@ -146,7 +146,7 @@ static const TimeValue k5To2Time = 41240; static const TimeValue k5To3Time = 41280; -// FuseFunction functions... +// FuseFunction functions... const NotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1; @@ -182,7 +182,7 @@ Caldoria::~Caldoria() { void Caldoria::init() { Neighborhood::init(); - // We need this notification flag as well. + // We need this notification flag as well. _neighborhoodNotification.notifyMe(this, kSinclairLoopDoneFlag, kSinclairLoopDoneFlag); _sinclairInterrupt.initCallBack(&_navMovie, kCallBackAtTime); @@ -948,7 +948,7 @@ void Caldoria::setUpRoofTop() { if (GameState.getCurrentDirection() == kEast && GameState.getCaldoriaGunAimed()) startExtraSequence(kCa53EastShootSinclair, kExtraCompletedFlag, false); else - // Fall through... + // Fall through... case kCaldoria49: case kCaldoria50: case kCaldoria51: @@ -1548,9 +1548,9 @@ void Caldoria::newInteraction(const InteractionID interactionID) { } } -// Only called when trying to pick up an item and the player can't (because -// the inventory is too full or because the player lets go of the item before -// dropping it into the inventory). +// Only called when trying to pick up an item and the player can't (because +// the inventory is too full or because the player lets go of the item before +// dropping it into the inventory). Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) { HotSpotID destSpotID = kNoHotSpotID; @@ -1919,7 +1919,7 @@ Common::String Caldoria::getHintMovie(uint hintNum) { else if (GameState.isTakenItemID(kShieldBiochip)) return "Images/AI/Caldoria/X48ND3"; - // *** Doesn't work yet, need global movies. + // *** Doesn't work yet, need global movies. break; } diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h index 64e566e95a..f02101ec3b 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria.h +++ b/engines/pegasus/neighborhood/caldoria/caldoria.h @@ -34,13 +34,13 @@ static const TimeScale kCaldoriaMovieScale = 600; static const TimeScale kCaldoriaFramesPerSecond = 15; static const TimeScale kCaldoriaFrameDuration = 40; -// Alternate IDs. +// Alternate IDs. static const AlternateID kAltCaldoriaNormal = 0; static const AlternateID kAltCaldoriaRoofDoorBlown = 2; static const AlternateID kAltCaldoriaSinclairDown = 3; -// Room IDs. +// Room IDs. static const RoomID kCaldoria00 = 1; static const RoomID kCaldoria01 = 2; @@ -106,7 +106,7 @@ static const RoomID kCaldoria55 = 61; static const RoomID kCaldoria56 = 62; static const RoomID kCaldoriaDeathRoom = 0; -// Hot Spot Activation IDs. +// Hot Spot Activation IDs. static const HotSpotActivationID kActivate4DClosed = 1; static const HotSpotActivationID kActivate4DOpen = 2; @@ -124,7 +124,7 @@ static const HotSpotActivationID kActivateReadyToTransport = 13; static const HotSpotActivationID kActivateRoofSlotEmpty = 14; static const HotSpotActivationID kActivateZoomedOnSinclair = 15; -// Hot Spot IDs. +// Hot Spot IDs. static const HotSpotID kCa4DEnvironOpenSpotID = 5000; static const HotSpotID kCa4DEnvironCloseSpotID = 5001; @@ -196,7 +196,7 @@ static const HotSpotID kCaldoriaRoofDoorSpotID = 5066; static const HotSpotID kCaldoriaRoofCardDropSpotID = 5067; static const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068; -// Extra sequence IDs. +// Extra sequence IDs. static const ExtraID kCaldoriaWakeUpView1 = 0; static const ExtraID kCaldoria00WakeUp1 = 1; @@ -310,14 +310,14 @@ static const ExtraID kCaldoria56BombStage6 = 108; static const ExtraID kCaldoria56BombStage7 = 109; static const ExtraID kCaldoria56BombExplodes = 110; -// Caldoria interactions. +// Caldoria interactions. static const InteractionID kCaldoria4DInteractionID = 0; static const InteractionID kCaldoriaBombInteractionID = 1; static const InteractionID kCaldoriaMessagesInteractionID = 2; static const InteractionID kCaldoriaMirrorInteractionID = 3; -// Caldoria: +// Caldoria: static const DisplayOrder kVidPhoneOrder = kMonitorLayer; static const DisplayOrder k4DSpritesOrder = kMonitorLayer; @@ -330,7 +330,7 @@ static const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1; ///////////////////////////////////////////// // -// Caldoria +// Caldoria static const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105; static const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28; @@ -374,7 +374,7 @@ static const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58; static const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58; static const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204; -// Caldoria display IDs. +// Caldoria display IDs. static const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID; static const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1; diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp index 0326bb7bb1..d8ac3b08cb 100755 --- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp @@ -30,9 +30,9 @@ namespace Pegasus { static const TimeValue kSwitchableSlop = 3 * kCaldoriaFrameDuration; -// Two seconds - some slop +// Two seconds - some slop static const TimeValue kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop; -// Twelve frames + some slop +// Twelve frames + some slop static const TimeValue kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop; static const TimeValue kSwitchable1Start = 0; diff --git a/engines/pegasus/neighborhood/door.h b/engines/pegasus/neighborhood/door.h index 55c36b659a..cd2af1328a 100755 --- a/engines/pegasus/neighborhood/door.h +++ b/engines/pegasus/neighborhood/door.h @@ -40,8 +40,8 @@ namespace Pegasus { typedef byte DoorFlags; enum { - kDoorPresentBit, // Bit set if there is a door here. - kDoorLockedBit // Bit set if door is locked, clear if unlocked. + kDoorPresentBit, // Bit set if there is a door here. + kDoorLockedBit // Bit set if door is locked, clear if unlocked. }; static const DoorFlags kNoDoorFlags = 0; diff --git a/engines/pegasus/neighborhood/exit.h b/engines/pegasus/neighborhood/exit.h index 10b1b5938e..baa3381f11 100755 --- a/engines/pegasus/neighborhood/exit.h +++ b/engines/pegasus/neighborhood/exit.h @@ -68,11 +68,11 @@ public: AlternateID altCode; TimeValue movieStart; TimeValue movieEnd; - // fExitEnd is the end of the optimized run of walks. + // exitEnd is the end of the optimized run of walks. TimeValue exitEnd; TimeValue originalEnd; - // fExitLoop is the loop start time of the optimized run of walks if the run - // loops back on itself (so far, only in TSA). + // exitLoop is the loop start time of the optimized run of walks if the run + // loops back on itself (so far, only in TSA). TimeValue exitLoop; RoomID exitRoom; DirectionConstant exitDirection; diff --git a/engines/pegasus/neighborhood/hotspotinfo.h b/engines/pegasus/neighborhood/hotspotinfo.h index d75e5e9bc7..26382718ec 100755 --- a/engines/pegasus/neighborhood/hotspotinfo.h +++ b/engines/pegasus/neighborhood/hotspotinfo.h @@ -53,12 +53,12 @@ public: HotSpotID hotspot; HotSpotActivationID hotspotActivation; - // Location hot spot lives in: + // Location hot spot lives in: RoomID hotspotRoom; DirectionConstant hotspotDirection; - // Extra to play if this is a "play extra" hot spot. + // Extra to play if this is a "play extra" hot spot. ExtraID hotspotExtra; - // Item corresponding to this hot spot if it is an item-related hot spot. + // Item corresponding to this hot spot if it is an item-related hot spot. ItemID hotspotItem; }; diff --git a/engines/pegasus/neighborhood/mars/constants.h b/engines/pegasus/neighborhood/mars/constants.h index b1013dacc5..82a7f03b68 100755 --- a/engines/pegasus/neighborhood/mars/constants.h +++ b/engines/pegasus/neighborhood/mars/constants.h @@ -30,7 +30,7 @@ namespace Pegasus { -// Element Coordinates +// Element Coordinates static const CoordType kUndoHiliteLeft = kNavAreaLeft + 140; static const CoordType kUndoHiliteTop = kNavAreaTop + 36; @@ -136,7 +136,7 @@ static const TimeValue kLaunchTubeReachedTime = 60 * 600 + 38 * 600 - kCanyonCha static const TimeValue kCanyonChaseFinishedTime = kCanyonChaseStop - kCanyonChaseStart - kLaunchTubeReachedTime; -// Left shuttle. +// Left shuttle. static const TimeValue kShuttleLeftIntroStart = 0; static const TimeValue kShuttleLeftIntroStop = 400; @@ -155,7 +155,7 @@ static const TimeValue kShuttleLeftGravitonTime = 600; static const TimeValue kShuttleLeftTractorTime = 640; -// Right shuttle. +// Right shuttle. static const TimeValue kShuttleRightIntroStart = 0; static const TimeValue kShuttleRightIntroStop = 400; @@ -175,7 +175,7 @@ static const TimeValue kShuttleRightGravitonTime = 1000; static const TimeValue kShuttleRightOverloadTime = 1040; -// Lower Left shuttle. +// Lower Left shuttle. static const TimeValue kShuttleLowerLeftCollisionTime = 0; @@ -183,7 +183,7 @@ static const TimeValue kShuttleLowerLeftTubeTime = 40; static const TimeValue kShuttleLowerLeftAutopilotTime = 80; -// Lower Right shuttle. +// Lower Right shuttle. static const TimeValue kShuttleLowerRightOffTime = 0; @@ -193,7 +193,7 @@ static const TimeValue kShuttleLowerRightTransportTime = 80; static const TimeValue kShuttleLowerRightTransportHiliteTime = 120; -// Center shuttle. +// Center shuttle. static const TimeValue kShuttleCenterBoardingTime = 0; @@ -223,7 +223,7 @@ static const TimeValue kShuttleCenterScanningTime = 480; static const TimeValue kShuttleCenterSafeTime = 520; -// Upper Left shuttle. +// Upper Left shuttle. static const TimeValue kShuttleUpperLeftDimTime = 0; @@ -233,7 +233,7 @@ static const TimeValue kShuttleUpperLeftGravitonTime = 80; static const TimeValue kShuttleUpperLeftTractorTime = 120; -// Upper Right shuttle. +// Upper Right shuttle. static const TimeValue kShuttleUpperRightLockedTime = 0; @@ -245,7 +245,7 @@ static const TimeValue kShuttleUpperRightOverloadTime = 120; static const TimeValue kShuttleUpperRightTargetDestroyedTime = 160; -// Shuttle distance +// Shuttle distance static const int kShuttleDistance = 500; @@ -469,7 +469,7 @@ static const TimeScale kMarsMovieScale = 600; static const TimeScale kMarsFramesPerSecond = 15; static const TimeScale kMarsFrameDuration = 40; -// Alternate IDs. +// Alternate IDs. static const AlternateID kAltMarsNormal = 0; static const AlternateID kAltMarsPodAtMars34 = 1; @@ -482,7 +482,7 @@ static const AlternateID kAltMarsMaskOnFiller = 7; static const AlternateID kAltMars60AirlockEast = 8; static const AlternateID kAltMars60AirlockWest = 9; -// Room IDs. +// Room IDs. static const RoomID kMars0A = 0; static const RoomID kMars00 = 1; @@ -711,7 +711,7 @@ static const RoomID kMarsMaze199 = 223; static const RoomID kMarsMaze200 = 224; static const RoomID kMarsDeathRoom = 225; -// Hot Spot Activation IDs. +// Hot Spot Activation IDs. static const HotSpotActivationID kActivationReadyForKiosk = 1; static const HotSpotActivationID kActivationKioskChoice = 2; @@ -738,7 +738,7 @@ static const HotSpotActivationID kActivateReactorBombExposed = 22; static const HotSpotActivationID kActivationRobotHeadClosed = 23; static const HotSpotActivationID kActivationRobotHeadOpen = 24; -// Hot Spot IDs. +// Hot Spot IDs. static const HotSpotID kMars11NorthKioskSpotID = 5000; static const HotSpotID kMars11NorthKioskSightsSpotID = 5001; @@ -814,7 +814,7 @@ static const HotSpotID kRobotShuttleMapChipSpotID = 5070; static const HotSpotID kRobotShuttleOpticalChipSpotID = 5071; static const HotSpotID kRobotShuttleShieldChipSpotID = 5072; -// Extra sequence IDs. +// Extra sequence IDs. static const ExtraID kMarsArrivalFromTSA = 0; static const ExtraID kMars0AWatchShuttleDepart = 1; diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp index 140bd12fc0..13dc6dfc77 100755 --- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp +++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp @@ -38,7 +38,7 @@ static const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, k static const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); static const float kGravitonZOrigin = kGravitonMinDistance; -// Width of graviton sprite... +// Width of graviton sprite... static const CoordType kGravitonMaxScreenWidth = 78; static const CoordType kGravitonMaxScreenHeight = 46; diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp index c83636754e..b516989e4d 100644 --- a/engines/pegasus/neighborhood/neighborhood.cpp +++ b/engines/pegasus/neighborhood/neighborhood.cpp @@ -240,7 +240,7 @@ void Neighborhood::arriveAt(RoomID room, DirectionConstant direction) { checkContinuePoint(room, direction); } -// These functions can be overridden to tweak the exact frames used. +// These functions can be overridden to tweak the exact frames used. void Neighborhood::getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry) { entry = _exitTable.findEntry(room, direction, _currentAlternate); @@ -305,7 +305,7 @@ void Neighborhood::getExtraEntry(const uint32 id, ExtraTable::Entry &extraEntry) ///////////////////////////////////////////// // -// "Can" functions: Called to see whether or not a user is allowed to do something +// "Can" functions: Called to see whether or not a user is allowed to do something CanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) { DoorTable::Entry door; @@ -313,8 +313,8 @@ CanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) { getExitEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), entry); getDoorEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), door); - // Fixed this so that doors that don't lead anywhere can be opened, but not walked - // through. + // Fixed this so that doors that don't lead anywhere can be opened, but not walked + // through. if (door.flags & kDoorPresentMask) { if (GameState.isCurrentDoorOpen()) { if (entry.exitRoom == kNoRoomID) @@ -593,9 +593,9 @@ void Neighborhood::stopStriding() { kMoveForwardCompletedFlag, kNeighborhoodMovieCompletedFlag | kMoveForwardCompletedFlag); } -// Compass support +// Compass support int16 Neighborhood::getStaticCompassAngle(const RoomID, const DirectionConstant dir) { - // North, south, east, west + // North, south, east, west static const int16 compassAngles[] = { 0, 180, 90, 270 }; return compassAngles[dir]; } @@ -1358,8 +1358,8 @@ void Neighborhood::getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec } void Neighborhood::setUpAIRules() { - // Set up default rules here: - // -- Energy warning rules. + // Set up default rules here: + // -- Energy warning rules. if (g_AIArea) { g_AIArea->forceAIUnlocked(); diff --git a/engines/pegasus/neighborhood/norad/constants.h b/engines/pegasus/neighborhood/norad/constants.h index e86422a273..37c1769309 100755 --- a/engines/pegasus/neighborhood/norad/constants.h +++ b/engines/pegasus/neighborhood/norad/constants.h @@ -207,7 +207,7 @@ static const int16 kElevatorCompassAngle = -40; static const int16 kSubPlatformCompassAngle = 45; static const int16 kSubControlCompassAngle = -10; -// Norad interactions. +// Norad interactions. static const InteractionID kNoradGlobeGameInteractionID = 0; static const InteractionID kNoradECRMonitorInteractionID = 1; @@ -219,7 +219,7 @@ static const InteractionID kNoradSubPlatformInteractionID = 6; ///////////////////////////////////////////// // -// Norad Alpha +// Norad Alpha static const CoordType kECRSlideShowLeft = kNavAreaLeft + 78; static const CoordType kECRSlideShowTop = kNavAreaTop + 1; @@ -306,7 +306,7 @@ static const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49; ///////////////////////////////////////////// // -// Norad Delta +// Norad Delta static const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360; static const CoordType kGlobeMonitorTop = kNavAreaTop + 144; @@ -359,7 +359,7 @@ static const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212; static const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478; static const CoordType kGlobeCountdownTop = kNavAreaTop + 164; -// Norad Alpha display IDs. +// Norad Alpha display IDs. static const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID; static const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1; @@ -383,7 +383,7 @@ static const DisplayElementID kSubControlCCWID = kSubControlUpID + 1; static const DisplayElementID kSubControlCWID = kSubControlCCWID + 1; static const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1; -// Norad Delta display IDs. +// Norad Delta display IDs. static const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID; static const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14; @@ -403,7 +403,7 @@ static const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1 static const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1; static const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1; -// Norad Alpha: +// Norad Alpha: static const DisplayOrder kECRMonitorOrder = kMonitorLayer; static const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1; @@ -431,7 +431,7 @@ static const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1; static const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1; static const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1; -// Norad Delta: +// Norad Delta: static const DisplayOrder kGlobeMonitorLayer = kMonitorLayer; static const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1; @@ -441,17 +441,17 @@ static const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1; static const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1; static const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1; -// Norad Alpha Tables +// Norad Alpha Tables static const TimeScale kNoradAlphaMovieScale = 600; static const TimeScale kNoradAlphaFramesPerSecond = 15; static const TimeScale kNoradAlphaFrameDuration = 40; -// Alternate IDs. +// Alternate IDs. static const AlternateID kAltNoradAlphaNormal = 0; -// Room IDs. +// Room IDs. static const RoomID kNorad01 = 0; static const RoomID kNorad01East = 1; @@ -484,10 +484,10 @@ static const RoomID kNorad21West = 27; static const RoomID kNorad22 = 28; static const RoomID kNorad22West = 29; -// Hot Spot Activation IDs. +// Hot Spot Activation IDs. -// Hot Spot IDs. +// Hot Spot IDs. static const HotSpotID kNorad01ECRSpotID = 5000; static const HotSpotID kNorad01GasSpotID = 5001; @@ -537,7 +537,7 @@ static const HotSpotID kNorad22ClawUpSpotID = 5044; static const HotSpotID kNorad22ClawCCWSpotID = 5045; static const HotSpotID kNorad22ClawCWSpotID = 5046; -// Extra sequence IDs. +// Extra sequence IDs. static const ExtraID kNoradArriveFromTSA = 0; static const ExtraID kNorad01RobotTaunt = 1; @@ -583,7 +583,7 @@ static const ExtraID kN22ClawDCounterclockwise = 40; static const ExtraID kN22ClawDClockwise = 41; -// Norad Delta Extra sequence IDs. +// Norad Delta Extra sequence IDs. static const ExtraID kArriveFromSubChase = 0; static const ExtraID kN59ZoomWithRobot = 1; @@ -654,11 +654,11 @@ static const TimeScale kNoradDeltaMovieScale = 600; static const TimeScale kNoradDeltaFramesPerSecond = 15; static const TimeScale kNoradDeltaFrameDuration = 40; -// Alternate IDs. +// Alternate IDs. static const AlternateID kAltNoradDeltaNormal = 0; -// Room IDs. +// Room IDs. static const RoomID kNorad41 = 0; static const RoomID kNorad42 = 1; @@ -700,10 +700,10 @@ static const RoomID kNorad78 = 36; static const RoomID kNorad79 = 37; static const RoomID kNorad79West = 38; -// Hot Spot Activation IDs. +// Hot Spot Activation IDs. -// Hot Spot IDs. +// Hot Spot IDs. static const HotSpotID kNorad48ElevatorSpotID = 5000; static const HotSpotID kNorad48ElevatorOutSpotID = 5001; diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp index d413554c05..7d4c1c5f8f 100755 --- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp +++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp @@ -196,7 +196,7 @@ void GlobeTracker::stopGlobeMovie() { } } -// Globe game PICTs: +// Globe game PICTs: static const ResIDType kGlobeCircleLeftPICTID = 300; static const ResIDType kGlobeCircleRightPICTID = 301; static const ResIDType kGlobeCircleUpPICTID = 302; diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp index 8a306fe2f1..b0e5b98725 100755 --- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp +++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp @@ -678,9 +678,9 @@ void SubControlRoom::receiveNotification(Notification *notification, const Notif dispatchClawAction(kMoveLeftActionIndex); break; case kClawAtB: - if (_clawStartPosition == kClawAtD) // Norad Alpha + if (_clawStartPosition == kClawAtD) // Norad Alpha dispatchClawAction(kMoveLeftActionIndex); - else if (_clawStartPosition == kClawAtC) // Norad Delta + else if (_clawStartPosition == kClawAtC) // Norad Delta dispatchClawAction(kMoveUpActionIndex); break; case kClawAtC: @@ -728,7 +728,7 @@ void SubControlRoom::activateHotspots() { g_allHotspots.activateOneHotspot(_clawControlSpotID); break; case kClawMenu: - // This could be called during a move, so use _clawNextPosition. + // This could be called during a move, so use _clawNextPosition. if (_playingAgainstRobot) { g_allHotspots.deactivateOneHotspot(_outSpotID); if (_robotState != kRobotApproaching && _nextAction == kNoActionIndex) @@ -813,9 +813,9 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) { dispatchClawAction(kMoveLeftActionIndex); break; case kClawAtB: - if (_clawStartPosition == kClawAtD) // Norad Alpha + if (_clawStartPosition == kClawAtD) // Norad Alpha dispatchClawAction(kMoveLeftActionIndex); - else if (_clawStartPosition == kClawAtC) // Norad Delta + else if (_clawStartPosition == kClawAtC) // Norad Delta dispatchClawAction(kMoveUpActionIndex); break; case kClawAtC: diff --git a/engines/pegasus/neighborhood/spot.cpp b/engines/pegasus/neighborhood/spot.cpp index 00c471ed61..f285bf9bc2 100755 --- a/engines/pegasus/neighborhood/spot.cpp +++ b/engines/pegasus/neighborhood/spot.cpp @@ -55,10 +55,10 @@ void SpotTable::clear() { _entries.clear(); } -// Two CSpotIndices are equal if -// In addition to having their rooms, directions and alt codes identical... -// They are both either loops or once only animations AND -// They overlap in at least one of the on arrival, on turn and on door open bits. +// Two SpotTable::Entries are equal if +// In addition to having their rooms, directions and alt codes identical... +// They are both either loops or once only animations AND +// They overlap in at least one of the on arrival, on turn and on door open bits. SpotTable::Entry SpotTable::findEntry(RoomID room, DirectionConstant direction, SpotFlags srcFlags, AlternateID altCode) { for (uint32 i = 0; i < _entries.size(); i++) if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode && (_entries[i].srcFlags & kSpotLoopsMask) == (srcFlags & kSpotLoopsMask) && ((_entries[i].srcFlags & srcFlags) & kSpotTriggers) != 0) diff --git a/engines/pegasus/neighborhood/spot.h b/engines/pegasus/neighborhood/spot.h index 086f1b2a2f..4be0864c2a 100755 --- a/engines/pegasus/neighborhood/spot.h +++ b/engines/pegasus/neighborhood/spot.h @@ -40,7 +40,7 @@ namespace Pegasus { typedef byte SpotFlags; enum { - kSpotLoopsBit, // Loop or once only? + kSpotLoopsBit, // Loop or once only? kSpotOnArrivalBit, kSpotOnTurnBit, kSpotOnDoorOpenBit diff --git a/engines/pegasus/notification.cpp b/engines/pegasus/notification.cpp index cc917a845c..91a876cb67 100755 --- a/engines/pegasus/notification.cpp +++ b/engines/pegasus/notification.cpp @@ -45,9 +45,9 @@ Notification::~Notification() { _owner->removeNotification(this); } -// Selectively set or clear notificiation bits. -// Wherever mask is 0, leave existing bits untouched. -// Wherever mask is 1, set bit equivalent to flags. +// Selectively set or clear notificiation bits. +// Wherever mask is 0, leave existing bits untouched. +// Wherever mask is 1, set bit equivalent to flags. void Notification::notifyMe(NotificationReceiver *receiver, NotificationFlags flags, NotificationFlags mask) { for (ReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++) { if (it->receiver == receiver) { @@ -87,7 +87,7 @@ void Notification::checkReceivers() { it->receiver->receiveNotification(this, currentFlags); } -// Receiver entries are equal if their receivers are equal. +// Receiver entries are equal if their receivers are equal. int operator==(const ReceiverEntry &entry1, const ReceiverEntry &entry2) { return entry1.receiver == entry2.receiver; diff --git a/engines/pegasus/notification.h b/engines/pegasus/notification.h index 91901c9287..142bf8c06d 100755 --- a/engines/pegasus/notification.h +++ b/engines/pegasus/notification.h @@ -57,12 +57,12 @@ public: Notification(const NotificationID id, NotificationManager *owner); virtual ~Notification(); - // NotifyMe will have this receiver notified when any of the specified notification - // flags are set. - // If there is already a notification set for this receiver, NotifyMe does a bitwise - // OR with the receiver's current notification flags. + // notifyMe will have this receiver notified when any of the specified notification + // flags are set. + // If there is already a notification set for this receiver, notifyMe does a bitwise + // OR with the receiver's current notification flags. - // Can selectively set or clear notification bits by using the flags and mask argument. + // Can selectively set or clear notification bits by using the flags and mask argument. void notifyMe(NotificationReceiver*, NotificationFlags flags, NotificationFlags mask); void cancelNotification(NotificationReceiver *receiver); @@ -88,8 +88,8 @@ public: virtual ~NotificationReceiver(); protected: - // ReceiveNotification is called automatically whenever a notification that this - // receiver depends on has its flags set + // receiveNotification is called automatically whenever a notification that this + // receiver depends on has its flags set virtual void receiveNotification(Notification *, const NotificationFlags); virtual void newNotification(Notification *notification); diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp index f5efbc0651..2f1da77a24 100644 --- a/engines/pegasus/pegasus.cpp +++ b/engines/pegasus/pegasus.cpp @@ -1613,10 +1613,10 @@ void PegasusEngine::dragTerminated(const Input &) { delete _draggingSprite; } else if (_dragType == kDragInventoryUse) { if (finalSpot && (finalSpot->getHotspotFlags() & kDropItemSpotFlag) != 0) { - // *** Need to decide on a case by case basis what to do here. - // the crowbar should break the cover off the Mars reactor if its frozen, the - // global transport card should slide through the slot, the oxygen mask should - // attach to the filling station, and so on... + // *** Need to decide on a case by case basis what to do here. + // the crowbar should break the cover off the Mars reactor if its frozen, the + // global transport card should slide through the slot, the oxygen mask should + // attach to the filling station, and so on... _neighborhood->dropItemIntoRoom(_draggingItem, finalSpot); delete _draggingSprite; } else { @@ -1635,7 +1635,7 @@ void PegasusEngine::dragItem(const Input &input, Item *item, DragType type) { _draggingItem = item; _dragType = type; - // Create the sprite. + // Create the sprite. _draggingSprite = _draggingItem->getDragSprite(kDraggingSpriteID); Common::Point where; input.getInputLocation(where); @@ -1644,7 +1644,7 @@ void PegasusEngine::dragItem(const Input &input, Item *item, DragType type) { r1 = Common::Rect::center(where.x, where.y, r1.width(), r1.height()); _draggingSprite->setBounds(r1); - // Set up drag constraints. + // Set up drag constraints. DisplayElement *navMovie = _gfx->findDisplayElement(kNavMovieID); Common::Rect r2; navMovie->getBounds(r2); diff --git a/engines/pegasus/scoring.h b/engines/pegasus/scoring.h index efae17c955..6ca99740dd 100755 --- a/engines/pegasus/scoring.h +++ b/engines/pegasus/scoring.h @@ -32,7 +32,7 @@ namespace Pegasus { ///////////////////////////////////////////// // -// Scoring. +// Scoring. static const CoordType kDeathScreenScoreLeft = 151; static const CoordType kDeathScreenScoreTop = 212; @@ -40,7 +40,7 @@ static const CoordType kDeathScreenScoreWidth = 124; static const CoordType kDeathScreenScoreHeight = 12; static const CoordType kDeathScreenScoreSkipVert = -16; -// Caldoria & TSA +// Caldoria & TSA static const GameScoreType kSawINNScore = 5; static const GameScoreType kTookShowerScore = 2; @@ -124,7 +124,7 @@ static const GameScoreType kMaxCaldoriaTSAScoreAfter = kWentAfterSinclairScore static const GameScoreType kMaxCaldoriaTSAScore = kMaxCaldoriaTSAScoreBefore + kMaxCaldoriaTSAScoreAfter; -// Prehistoric +// Prehistoric static const GameScoreType kThrewBreakerScore = 10; static const GameScoreType kExtendedBridgeScore = 10; @@ -136,7 +136,7 @@ static const GameScoreType kMaxPrehistoricScore = kThrewBreakerScore + kGotHistoricalLogScore + kFinishedPrehistoricScore; -// Mars +// Mars static const GameScoreType kThrownByRobotScore = 3; static const GameScoreType kGotMarsCardScore = 5; @@ -182,7 +182,7 @@ static const GameScoreType kMaxMarsScore = kThrownByRobotScore + kGotMarsOpMemChipScore + kFinishedMarsScore; -// Norad +// Norad static const GameScoreType kSawSecurityMonitorScore = 5; static const GameScoreType kFilledOxygenCanisterScore = 5; @@ -216,7 +216,7 @@ static const GameScoreType kMaxNoradScore = kSawSecurityMonitorScore + kGotNoradOpMemChipScore + kFinishedNoradScore; -// WSC +// WSC static const GameScoreType kRemovedDartScore = 5; static const GameScoreType kAnalyzedDartScore = 5; @@ -260,7 +260,7 @@ static const GameScoreType kMaxWSCScore = kRemovedDartScore + kGotWSCOpMemChipScore + kFinishedWSCScore; -// Gandhi +// Gandhi static const GameScoreType kMarsGandhiScore = 10; static const GameScoreType kNoradGandhiScore = 10; diff --git a/engines/pegasus/sound.h b/engines/pegasus/sound.h index f6e175dd73..57cfd52e41 100755 --- a/engines/pegasus/sound.h +++ b/engines/pegasus/sound.h @@ -38,15 +38,15 @@ namespace Pegasus { class SoundFader; -// Things you might want to do with sound: -// Start it -// Stop it -// Loop it -// Pause it -// Set the volume -// Set the pitch (rate) -// Pan the sound -// Change these settings dynamically over time +// Things you might want to do with sound: +// - Start it +// - Stop it +// - Loop it +// - Pause it +// - Set the volume +// - Set the pitch (rate) +// - Pan the sound +// - Change these settings dynamically over time class Sound { public: diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp index 49071a2936..5b7c903ad6 100755 --- a/engines/pegasus/timers.cpp +++ b/engines/pegasus/timers.cpp @@ -275,7 +275,7 @@ void TimeBase::checkCallBacks() { } } -// Protected functions only called by TimeBaseCallBack. +// Protected functions only called by TimeBaseCallBack. void TimeBase::addCallBack(TimeBaseCallBack *callBack) { callBack->_nextCallBack = _callBackList; diff --git a/engines/pegasus/transition.h b/engines/pegasus/transition.h index dcd68e4c64..f32db63ebd 100755 --- a/engines/pegasus/transition.h +++ b/engines/pegasus/transition.h @@ -47,8 +47,8 @@ private: static uint32 getBlack(); }; -// Transitions are faders that range over [0,1000], which makes their -// "resolution" one tenth of a percent +// Transitions are faders that range over [0,1000], which makes their +// "resolution" one tenth of a percent static const int kTransitionBottom = 0; static const int kTransitionTop = 1000; diff --git a/engines/pegasus/types.h b/engines/pegasus/types.h index 6527e2ce27..73a4e98491 100755 --- a/engines/pegasus/types.h +++ b/engines/pegasus/types.h @@ -118,10 +118,10 @@ typedef int32 AIConditionID; enum EnergyStage { kStageNoStage, - kStageCasual, // more than 50% energy - kStageWorried, // more than 25% energy - kStageNervous, // more than 5% energy - kStagePanicStricken // less than 5% energy + kStageCasual, // more than 50% energy + kStageWorried, // more than 25% energy + kStageNervous, // more than 5% energy + kStagePanicStricken // less than 5% energy }; enum NoradSubPrepState { |