From 12efb47b536d2f663c9cde2739a1fd40599da669 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Fri, 16 Dec 2011 14:17:50 -0500 Subject: PEGASUS: Remove t prefix from typedefs Some other minor cleanup too --- engines/pegasus/scoring.h | 228 +++++++++++++++++++++++----------------------- 1 file changed, 114 insertions(+), 114 deletions(-) (limited to 'engines/pegasus/scoring.h') diff --git a/engines/pegasus/scoring.h b/engines/pegasus/scoring.h index bd09f2b834..41dcb4b9a6 100755 --- a/engines/pegasus/scoring.h +++ b/engines/pegasus/scoring.h @@ -34,55 +34,55 @@ namespace Pegasus { // // Scoring. -const tCoordType kDeathScreenScoreLeft = 151; -const tCoordType kDeathScreenScoreTop = 212; -const tCoordType kDeathScreenScoreWidth = 124; -const tCoordType kDeathScreenScoreHeight = 12; -const tCoordType kDeathScreenScoreSkipVert = -16; +const CoordType kDeathScreenScoreLeft = 151; +const CoordType kDeathScreenScoreTop = 212; +const CoordType kDeathScreenScoreWidth = 124; +const CoordType kDeathScreenScoreHeight = 12; +const CoordType kDeathScreenScoreSkipVert = -16; // Caldoria & TSA -const tGameScoreType kSawINNScore = 5; -const tGameScoreType kTookShowerScore = 2; -const tGameScoreType kFixedHairScore = 2; -const tGameScoreType kGotKeyCardScore = 5; -const tGameScoreType kReadPaperScore = 2; -const tGameScoreType kLookThroughTelescopeScore = 2; -const tGameScoreType kSawCaldoriaKioskScore = 2; -const tGameScoreType kGoToTSAScore = 3; +const GameScoreType kSawINNScore = 5; +const GameScoreType kTookShowerScore = 2; +const GameScoreType kFixedHairScore = 2; +const GameScoreType kGotKeyCardScore = 5; +const GameScoreType kReadPaperScore = 2; +const GameScoreType kLookThroughTelescopeScore = 2; +const GameScoreType kSawCaldoriaKioskScore = 2; +const GameScoreType kGoToTSAScore = 3; -const tGameScoreType kEnterTSAScore = 2; -const tGameScoreType kSawBust1Score = 2; -const tGameScoreType kSawBust2Score = 2; -const tGameScoreType kSawBust3Score = 2; -const tGameScoreType kSawBust4Score = 2; -const tGameScoreType kSawBust5Score = 2; -const tGameScoreType kSawBust6Score = 2; -const tGameScoreType kSawTheoryScore = 4; -const tGameScoreType kSawBackgroundScore = 4; -const tGameScoreType kSawProcedureScore = 4; -const tGameScoreType kGotJourneymanKeyScore = 5; -const tGameScoreType kGotPegasusBiochipScore = 5; -const tGameScoreType kGotBiosuitScore = 5; -const tGameScoreType kGoToPrehistoricScore = 5; +const GameScoreType kEnterTSAScore = 2; +const GameScoreType kSawBust1Score = 2; +const GameScoreType kSawBust2Score = 2; +const GameScoreType kSawBust3Score = 2; +const GameScoreType kSawBust4Score = 2; +const GameScoreType kSawBust5Score = 2; +const GameScoreType kSawBust6Score = 2; +const GameScoreType kSawTheoryScore = 4; +const GameScoreType kSawBackgroundScore = 4; +const GameScoreType kSawProcedureScore = 4; +const GameScoreType kGotJourneymanKeyScore = 5; +const GameScoreType kGotPegasusBiochipScore = 5; +const GameScoreType kGotBiosuitScore = 5; +const GameScoreType kGoToPrehistoricScore = 5; -const tGameScoreType kPutLogInReaderScore = 5; -const tGameScoreType kSawCaldoriaNormalScore = 2; -const tGameScoreType kSawCaldoriaAlteredScore = 2; -const tGameScoreType kSawNoradNormalScore = 2; -const tGameScoreType kSawNoradAlteredScore = 2; -const tGameScoreType kSawMarsNormalScore = 2; -const tGameScoreType kSawMarsAlteredScore = 2; -const tGameScoreType kSawWSCNormalScore = 2; -const tGameScoreType kSawWSCAlteredScore = 2; -const tGameScoreType kWentToReadyRoom2Score = 5; -const tGameScoreType kWentAfterSinclairScore = 5; -const tGameScoreType kUsedCardBombScore = 10; -const tGameScoreType kShieldedCardBombScore = 5; -const tGameScoreType kStunnedSinclairScore = 10; -const tGameScoreType kDisarmedNukeScore = 10; +const GameScoreType kPutLogInReaderScore = 5; +const GameScoreType kSawCaldoriaNormalScore = 2; +const GameScoreType kSawCaldoriaAlteredScore = 2; +const GameScoreType kSawNoradNormalScore = 2; +const GameScoreType kSawNoradAlteredScore = 2; +const GameScoreType kSawMarsNormalScore = 2; +const GameScoreType kSawMarsAlteredScore = 2; +const GameScoreType kSawWSCNormalScore = 2; +const GameScoreType kSawWSCAlteredScore = 2; +const GameScoreType kWentToReadyRoom2Score = 5; +const GameScoreType kWentAfterSinclairScore = 5; +const GameScoreType kUsedCardBombScore = 10; +const GameScoreType kShieldedCardBombScore = 5; +const GameScoreType kStunnedSinclairScore = 10; +const GameScoreType kDisarmedNukeScore = 10; -const tGameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + +const GameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + kTookShowerScore + kFixedHairScore + kGotKeyCardScore + @@ -115,52 +115,52 @@ const tGameScoreType kMaxCaldoriaTSAScoreBefore = kSawINNScore + kSawWSCAlteredScore + kWentToReadyRoom2Score; -const tGameScoreType kMaxCaldoriaTSAScoreAfter = kWentAfterSinclairScore + +const GameScoreType kMaxCaldoriaTSAScoreAfter = kWentAfterSinclairScore + kUsedCardBombScore + kShieldedCardBombScore + kStunnedSinclairScore + kDisarmedNukeScore; -const tGameScoreType kMaxCaldoriaTSAScore = kMaxCaldoriaTSAScoreBefore + +const GameScoreType kMaxCaldoriaTSAScore = kMaxCaldoriaTSAScoreBefore + kMaxCaldoriaTSAScoreAfter; // Prehistoric -const tGameScoreType kThrewBreakerScore = 10; -const tGameScoreType kExtendedBridgeScore = 10; -const tGameScoreType kGotHistoricalLogScore = 5; -const tGameScoreType kFinishedPrehistoricScore = 10; +const GameScoreType kThrewBreakerScore = 10; +const GameScoreType kExtendedBridgeScore = 10; +const GameScoreType kGotHistoricalLogScore = 5; +const GameScoreType kFinishedPrehistoricScore = 10; -const tGameScoreType kMaxPrehistoricScore = kThrewBreakerScore + +const GameScoreType kMaxPrehistoricScore = kThrewBreakerScore + kExtendedBridgeScore + kGotHistoricalLogScore + kFinishedPrehistoricScore; // Mars -const tGameScoreType kThrownByRobotScore = 3; -const tGameScoreType kGotMarsCardScore = 5; -const tGameScoreType kSawMarsKioskScore = 2; -const tGameScoreType kSawTransportMapScore = 2; -const tGameScoreType kGotCrowBarScore = 5; -const tGameScoreType kTurnedOnTransportScore = 5; -const tGameScoreType kGotOxygenMaskScore = 5; -const tGameScoreType kAvoidedRobotScore = 5; -const tGameScoreType kActivatedPlatformScore = 2; -const tGameScoreType kUsedLiquidNitrogenScore = 3; -const tGameScoreType kUsedCrowBarScore = 3; -const tGameScoreType kFoundCardBombScore = 4; -const tGameScoreType kDisarmedCardBombScore = 8; -const tGameScoreType kGotCardBombScore = 5; -const tGameScoreType kThreadedMazeScore = 5; -const tGameScoreType kThreadedGearRoomScore = 2; -const tGameScoreType kEnteredShuttleScore = 2; -const tGameScoreType kEnteredLaunchTubeScore = 4; -const tGameScoreType kStoppedRobotsShuttleScore = 10; -const tGameScoreType kGotMarsOpMemChipScore = 10; -const tGameScoreType kFinishedMarsScore = 10; +const GameScoreType kThrownByRobotScore = 3; +const GameScoreType kGotMarsCardScore = 5; +const GameScoreType kSawMarsKioskScore = 2; +const GameScoreType kSawTransportMapScore = 2; +const GameScoreType kGotCrowBarScore = 5; +const GameScoreType kTurnedOnTransportScore = 5; +const GameScoreType kGotOxygenMaskScore = 5; +const GameScoreType kAvoidedRobotScore = 5; +const GameScoreType kActivatedPlatformScore = 2; +const GameScoreType kUsedLiquidNitrogenScore = 3; +const GameScoreType kUsedCrowBarScore = 3; +const GameScoreType kFoundCardBombScore = 4; +const GameScoreType kDisarmedCardBombScore = 8; +const GameScoreType kGotCardBombScore = 5; +const GameScoreType kThreadedMazeScore = 5; +const GameScoreType kThreadedGearRoomScore = 2; +const GameScoreType kEnteredShuttleScore = 2; +const GameScoreType kEnteredLaunchTubeScore = 4; +const GameScoreType kStoppedRobotsShuttleScore = 10; +const GameScoreType kGotMarsOpMemChipScore = 10; +const GameScoreType kFinishedMarsScore = 10; -const tGameScoreType kMaxMarsScore = kThrownByRobotScore + +const GameScoreType kMaxMarsScore = kThrownByRobotScore + kGotMarsCardScore + kSawMarsKioskScore + kSawTransportMapScore + @@ -184,23 +184,23 @@ const tGameScoreType kMaxMarsScore = kThrownByRobotScore + // Norad -const tGameScoreType kSawSecurityMonitorScore = 5; -const tGameScoreType kFilledOxygenCanisterScore = 5; -const tGameScoreType kFilledArgonCanisterScore = 5; -const tGameScoreType kSawUnconsciousOperatorScore = 5; -const tGameScoreType kWentThroughPressureDoorScore = 5; -const tGameScoreType kPreppedSubScore = 5; -const tGameScoreType kEnteredSubScore = 5; -const tGameScoreType kExitedSubScore = 10; -const tGameScoreType kSawRobotAt54NorthScore = 5; -const tGameScoreType kPlayedWithClawScore = 5; -const tGameScoreType kUsedRetinalChipScore = 5; -const tGameScoreType kFinishedGlobeGameScore = 10; -const tGameScoreType kStoppedNoradRobotScore = 10; -const tGameScoreType kGotNoradOpMemChipScore = 10; -const tGameScoreType kFinishedNoradScore = 10; +const GameScoreType kSawSecurityMonitorScore = 5; +const GameScoreType kFilledOxygenCanisterScore = 5; +const GameScoreType kFilledArgonCanisterScore = 5; +const GameScoreType kSawUnconsciousOperatorScore = 5; +const GameScoreType kWentThroughPressureDoorScore = 5; +const GameScoreType kPreppedSubScore = 5; +const GameScoreType kEnteredSubScore = 5; +const GameScoreType kExitedSubScore = 10; +const GameScoreType kSawRobotAt54NorthScore = 5; +const GameScoreType kPlayedWithClawScore = 5; +const GameScoreType kUsedRetinalChipScore = 5; +const GameScoreType kFinishedGlobeGameScore = 10; +const GameScoreType kStoppedNoradRobotScore = 10; +const GameScoreType kGotNoradOpMemChipScore = 10; +const GameScoreType kFinishedNoradScore = 10; -const tGameScoreType kMaxNoradScore = kSawSecurityMonitorScore + +const GameScoreType kMaxNoradScore = kSawSecurityMonitorScore + kFilledOxygenCanisterScore + kFilledArgonCanisterScore + kSawUnconsciousOperatorScore + @@ -218,28 +218,28 @@ const tGameScoreType kMaxNoradScore = kSawSecurityMonitorScore + // WSC -const tGameScoreType kRemovedDartScore = 5; -const tGameScoreType kAnalyzedDartScore = 5; -const tGameScoreType kBuiltAntidoteScore = 5; -const tGameScoreType kGotSinclairKeyScore = 5; -const tGameScoreType kGotArgonCanisterScore = 5; -const tGameScoreType kGotNitrogenCanisterScore = 5; -const tGameScoreType kPlayedWithMessagesScore = 2; -const tGameScoreType kSawMorphExperimentScore = 3; -const tGameScoreType kEnteredSinclairOfficeScore = 2; -const tGameScoreType kSawBrochureScore = 3; -const tGameScoreType kSawSinclairEntry1Score = 3; -const tGameScoreType kSawSinclairEntry2Score = 3; -const tGameScoreType kSawSinclairEntry3Score = 3; -const tGameScoreType kSawWSCDirectoryScore = 3; -const tGameScoreType kUsedCrowBarInWSCScore = 5; -const tGameScoreType kFinishedPlasmaDodgeScore = 10; -const tGameScoreType kOpenedCatwalkScore = 3; -const tGameScoreType kStoppedWSCRobotScore = 10; -const tGameScoreType kGotWSCOpMemChipScore = 10; -const tGameScoreType kFinishedWSCScore = 10; +const GameScoreType kRemovedDartScore = 5; +const GameScoreType kAnalyzedDartScore = 5; +const GameScoreType kBuiltAntidoteScore = 5; +const GameScoreType kGotSinclairKeyScore = 5; +const GameScoreType kGotArgonCanisterScore = 5; +const GameScoreType kGotNitrogenCanisterScore = 5; +const GameScoreType kPlayedWithMessagesScore = 2; +const GameScoreType kSawMorphExperimentScore = 3; +const GameScoreType kEnteredSinclairOfficeScore = 2; +const GameScoreType kSawBrochureScore = 3; +const GameScoreType kSawSinclairEntry1Score = 3; +const GameScoreType kSawSinclairEntry2Score = 3; +const GameScoreType kSawSinclairEntry3Score = 3; +const GameScoreType kSawWSCDirectoryScore = 3; +const GameScoreType kUsedCrowBarInWSCScore = 5; +const GameScoreType kFinishedPlasmaDodgeScore = 10; +const GameScoreType kOpenedCatwalkScore = 3; +const GameScoreType kStoppedWSCRobotScore = 10; +const GameScoreType kGotWSCOpMemChipScore = 10; +const GameScoreType kFinishedWSCScore = 10; -const tGameScoreType kMaxWSCScore = kRemovedDartScore + +const GameScoreType kMaxWSCScore = kRemovedDartScore + kAnalyzedDartScore + kBuiltAntidoteScore + kGotSinclairKeyScore + @@ -262,15 +262,15 @@ const tGameScoreType kMaxWSCScore = kRemovedDartScore + // Gandhi -const tGameScoreType kMarsGandhiScore = 10; -const tGameScoreType kNoradGandhiScore = 10; -const tGameScoreType kWSCGandhiScore = 10; +const GameScoreType kMarsGandhiScore = 10; +const GameScoreType kNoradGandhiScore = 10; +const GameScoreType kWSCGandhiScore = 10; -const tGameScoreType kMaxGandhiScore = kMarsGandhiScore + +const GameScoreType kMaxGandhiScore = kMarsGandhiScore + kNoradGandhiScore + kWSCGandhiScore; -const tGameScoreType kMaxTotalScore = kMaxCaldoriaTSAScore + +const GameScoreType kMaxTotalScore = kMaxCaldoriaTSAScore + kMaxPrehistoricScore + kMaxMarsScore + kMaxNoradScore + -- cgit v1.2.3