diff options
author | Matthew Hoops | 2011-12-16 14:17:50 -0500 |
---|---|---|
committer | Matthew Hoops | 2011-12-16 14:17:50 -0500 |
commit | 12efb47b536d2f663c9cde2739a1fd40599da669 (patch) | |
tree | 9ce08d6a798ff5138ee2908642e6468d7d2b249e /engines/pegasus/neighborhood/prehistoric | |
parent | fdced472abc830c07d28474727db004c8018fcac (diff) | |
download | scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.gz scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.tar.bz2 scummvm-rg350-12efb47b536d2f663c9cde2739a1fd40599da669.zip |
PEGASUS: Remove t prefix from typedefs
Some other minor cleanup too
Diffstat (limited to 'engines/pegasus/neighborhood/prehistoric')
-rwxr-xr-x | engines/pegasus/neighborhood/prehistoric/prehistoric.cpp | 16 | ||||
-rwxr-xr-x | engines/pegasus/neighborhood/prehistoric/prehistoric.h | 112 |
2 files changed, 64 insertions, 64 deletions
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp index 50b6d87e90..b67d31ad95 100755 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp @@ -168,7 +168,7 @@ void Prehistoric::setUpAIRules() { } } -TimeValue Prehistoric::getViewTime(const tRoomID room, const tDirectionConstant direction) { +TimeValue Prehistoric::getViewTime(const RoomID room, const DirectionConstant direction) { ExtraTable::Entry extra; uint32 extraID = 0xffffffff; @@ -197,7 +197,7 @@ TimeValue Prehistoric::getViewTime(const tRoomID room, const tDirectionConstant } -void Prehistoric::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) { +void Prehistoric::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) { Neighborhood::findSpotEntry(room, direction, flags, entry); switch (MakeRoomView(room, direction)) { @@ -220,7 +220,7 @@ void Prehistoric::findSpotEntry(const tRoomID room, const tDirectionConstant dir } } -int16 Prehistoric::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) { +int16 Prehistoric::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) { if (room == kPrehistoricDeath) return g_compass->getFaderValue(); @@ -260,7 +260,7 @@ void Prehistoric::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMov } } -void Prehistoric::turnTo(const tDirectionConstant newDirection) { +void Prehistoric::turnTo(const DirectionConstant newDirection) { setCurrentAlternate(kAltPrehistoricNormal); _privateFlags.setFlag(kPrehistoricPrivateVaultOpenFlag, false); Neighborhood::turnTo(newDirection); @@ -308,7 +308,7 @@ void Prehistoric::zoomToVault() { startExtraSequence(kPre18EastZoom, kExtraCompletedFlag, kFilterNoInput); } -void Prehistoric::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) { +void Prehistoric::checkContinuePoint(const RoomID room, const DirectionConstant direction) { switch (MakeRoomView(room, direction)) { case MakeRoomView(kPrehistoric08, kEast): case MakeRoomView(kPrehistoric18, kSouth): @@ -320,7 +320,7 @@ void Prehistoric::checkContinuePoint(const tRoomID room, const tDirectionConstan } } -void Prehistoric::arriveAt(const tRoomID room, const tDirectionConstant direction) { +void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) { Item *keyCard; if (MakeRoomView(room, direction) == MakeRoomView(kPrehistoric25, kEast) && @@ -397,7 +397,7 @@ void Prehistoric::arriveAt(const tRoomID room, const tDirectionConstant directio } void Prehistoric::loadAmbientLoops() { - tRoomID room = GameState.getCurrentRoom(); + RoomID room = GameState.getCurrentRoom(); switch (room) { case kPrehistoric02: @@ -518,7 +518,7 @@ void Prehistoric::clickInHotspot(const Input &input, const Hotspot *spot) { } } -void Prehistoric::receiveNotification(Notification *notification, const tNotificationFlags flags) { +void Prehistoric::receiveNotification(Notification *notification, const NotificationFlags flags) { Neighborhood::receiveNotification(notification, flags); if ((flags & kExtraCompletedFlag) != 0) { diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.h b/engines/pegasus/neighborhood/prehistoric/prehistoric.h index 44084f5110..786a7f7a61 100755 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.h +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.h @@ -36,67 +36,67 @@ const TimeScale kPrehistoricFrameDuration = 40; // Alternate IDs. -const tAlternateID kAltPrehistoricNormal = 0; -const tAlternateID kAltPrehistoricBridgeSet = 1; +const AlternateID kAltPrehistoricNormal = 0; +const AlternateID kAltPrehistoricBridgeSet = 1; // Room IDs. -const tRoomID kPrehistoric01 = 0; -const tRoomID kPrehistoric02 = 1; -const tRoomID kPrehistoric03 = 2; -const tRoomID kPrehistoric04 = 3; -const tRoomID kPrehistoric05 = 4; -const tRoomID kPrehistoric06 = 5; -const tRoomID kPrehistoric07 = 6; -const tRoomID kPrehistoric08 = 7; -const tRoomID kPrehistoric09 = 8; -const tRoomID kPrehistoric10 = 9; -const tRoomID kPrehistoric11 = 10; -const tRoomID kPrehistoric12 = 11; -const tRoomID kPrehistoric13 = 12; -const tRoomID kPrehistoric14 = 13; -const tRoomID kPrehistoric15 = 14; -const tRoomID kPrehistoric16 = 15; -const tRoomID kPrehistoric17 = 16; -const tRoomID kPrehistoric18 = 17; -const tRoomID kPrehistoric19 = 18; -const tRoomID kPrehistoric20 = 19; -const tRoomID kPrehistoric21 = 20; -const tRoomID kPrehistoric22 = 21; -const tRoomID kPrehistoric22North = 22; -const tRoomID kPrehistoric23 = 23; -const tRoomID kPrehistoric24 = 24; -const tRoomID kPrehistoric25 = 25; -const tRoomID kPrehistoricDeath = 26; +const RoomID kPrehistoric01 = 0; +const RoomID kPrehistoric02 = 1; +const RoomID kPrehistoric03 = 2; +const RoomID kPrehistoric04 = 3; +const RoomID kPrehistoric05 = 4; +const RoomID kPrehistoric06 = 5; +const RoomID kPrehistoric07 = 6; +const RoomID kPrehistoric08 = 7; +const RoomID kPrehistoric09 = 8; +const RoomID kPrehistoric10 = 9; +const RoomID kPrehistoric11 = 10; +const RoomID kPrehistoric12 = 11; +const RoomID kPrehistoric13 = 12; +const RoomID kPrehistoric14 = 13; +const RoomID kPrehistoric15 = 14; +const RoomID kPrehistoric16 = 15; +const RoomID kPrehistoric17 = 16; +const RoomID kPrehistoric18 = 17; +const RoomID kPrehistoric19 = 18; +const RoomID kPrehistoric20 = 19; +const RoomID kPrehistoric21 = 20; +const RoomID kPrehistoric22 = 21; +const RoomID kPrehistoric22North = 22; +const RoomID kPrehistoric23 = 23; +const RoomID kPrehistoric24 = 24; +const RoomID kPrehistoric25 = 25; +const RoomID kPrehistoricDeath = 26; // Hot Spot Activation IDs. -const tHotSpotActivationID kActivationVaultClosed = 1; -const tHotSpotActivationID kActivationVaultOpen = 2; +const HotSpotActivationID kActivationVaultClosed = 1; +const HotSpotActivationID kActivationVaultOpen = 2; // Hot Spot IDs. -const tHotSpotID kPre18EastSpotID = 5000; -const tHotSpotID kPre22NorthSpotID = 5001; -const tHotSpotID kPre22NorthOutSpotID = 5002; -const tHotSpotID kPre22NorthBreakerSpotID = 5003; -const tHotSpotID kPrehistoricKeyDropSpotID = 5004; -const tHotSpotID kPrehistoricHistoricalLogSpotID = 5005; +const HotSpotID kPre18EastSpotID = 5000; +const HotSpotID kPre22NorthSpotID = 5001; +const HotSpotID kPre22NorthOutSpotID = 5002; +const HotSpotID kPre22NorthBreakerSpotID = 5003; +const HotSpotID kPrehistoricKeyDropSpotID = 5004; +const HotSpotID kPrehistoricHistoricalLogSpotID = 5005; // Extra sequence IDs. -const tExtraID kPreArrivalFromTSA = 0; -const tExtraID kPre18EastBridgeOut = 1; -const tExtraID kPre18EastBridgeOn = 2; -const tExtraID kPre18EastZoom = 3; -const tExtraID kPre18EastZoomOut = 4; -const tExtraID kPre22ThrowBreaker = 5; -const tExtraID kPre25EastUnlockingVaultWithLog = 6; -const tExtraID kPre25EastVaultOpenWithLog = 7; -const tExtraID kPre25EastViewWithLog = 8; -const tExtraID kPre25EastUnlockingVaultNoLog = 9; -const tExtraID kPre25EastVaultOpenNoLog = 10; -const tExtraID kPre25EastViewNoLog = 11; +const ExtraID kPreArrivalFromTSA = 0; +const ExtraID kPre18EastBridgeOut = 1; +const ExtraID kPre18EastBridgeOn = 2; +const ExtraID kPre18EastZoom = 3; +const ExtraID kPre18EastZoomOut = 4; +const ExtraID kPre22ThrowBreaker = 5; +const ExtraID kPre25EastUnlockingVaultWithLog = 6; +const ExtraID kPre25EastVaultOpenWithLog = 7; +const ExtraID kPre25EastViewWithLog = 8; +const ExtraID kPre25EastUnlockingVaultNoLog = 9; +const ExtraID kPre25EastVaultOpenNoLog = 10; +const ExtraID kPre25EastViewNoLog = 11; class PegasusEngine; @@ -108,7 +108,7 @@ public: virtual uint16 getDateResID() const; virtual void init(); - virtual void arriveAt(const tRoomID, const tDirectionConstant); + virtual void arriveAt(const RoomID, const DirectionConstant); virtual void activateHotspots(); virtual void clickInHotspot(const Input &, const Hotspot *); Common::String getBriefingMovie(); @@ -124,7 +124,7 @@ public: void bumpIntoWall(); - void checkContinuePoint(const tRoomID, const tDirectionConstant); + void checkContinuePoint(const RoomID, const DirectionConstant); bool canSolve(); void doSolve(); @@ -137,13 +137,13 @@ protected: }; void setUpAIRules(); - int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant); + int16 getStaticCompassAngle(const RoomID, const DirectionConstant); void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &); - virtual void receiveNotification(Notification *, const tNotificationFlags); - void turnTo(const tDirectionConstant); + virtual void receiveNotification(Notification *, const NotificationFlags); + void turnTo(const DirectionConstant); void zoomToVault(); - TimeValue getViewTime(const tRoomID, const tDirectionConstant); - void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &); + TimeValue getViewTime(const RoomID, const DirectionConstant); + void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &); void loadAmbientLoops(); |