diff options
author | Matthew Hoops | 2011-12-16 23:24:55 -0500 |
---|---|---|
committer | Matthew Hoops | 2011-12-16 23:24:55 -0500 |
commit | f72884cb7bbe594888f6d14a3e03c7839ef2c508 (patch) | |
tree | 14df52c836810a427fcfdacfa71e2d54ea301a33 /engines/pegasus/neighborhood/norad/subplatform.cpp | |
parent | 12efb47b536d2f663c9cde2739a1fd40599da669 (diff) | |
download | scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.tar.gz scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.tar.bz2 scummvm-rg350-f72884cb7bbe594888f6d14a3e03c7839ef2c508.zip |
PEGASUS: Cleanup some constants
Added missing static qualifiers, get rid of some short/long
Diffstat (limited to 'engines/pegasus/neighborhood/norad/subplatform.cpp')
-rwxr-xr-x | engines/pegasus/neighborhood/norad/subplatform.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/pegasus/neighborhood/norad/subplatform.cpp b/engines/pegasus/neighborhood/norad/subplatform.cpp index 7f1df535b5..bfe93ea22c 100755 --- a/engines/pegasus/neighborhood/norad/subplatform.cpp +++ b/engines/pegasus/neighborhood/norad/subplatform.cpp @@ -35,30 +35,30 @@ namespace Pegasus { // As usual, times here are in seconds. -const TimeValue kNormalSplashStart = 0; -const TimeValue kNormalSplashStop = 5; +static const TimeValue kNormalSplashStart = 0; +static const TimeValue kNormalSplashStop = 5; -const TimeValue kPrepSubStart = 5; -const TimeValue kPrepSubStop = 15; +static const TimeValue kPrepSubStart = 5; +static const TimeValue kPrepSubStop = 15; -const TimeValue kPrepIncompleteStart = 15; -const TimeValue kPrepIncompleteStop = 19; +static const TimeValue kPrepIncompleteStart = 15; +static const TimeValue kPrepIncompleteStop = 19; -const TimeValue kDamagedStart = 19; -const TimeValue kDamagedStop = 28; +static const TimeValue kDamagedStart = 19; +static const TimeValue kDamagedStop = 28; -const NotificationFlags kNormalSplashFinished = 1; -const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; -const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; -const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; +static const NotificationFlags kNormalSplashFinished = 1; +static const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1; +static const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1; +static const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1; -const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | +static const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished | kPrepSubFinished | kPrepIncompleteFinished | kDamagedFinished; -const uint16 kSubPreppedBit = (1 << 0); -const uint16 kWaitingForPlayerBit = (1 << 1); +static const uint16 kSubPreppedBit = (1 << 0); +static const uint16 kWaitingForPlayerBit = (1 << 1); SubPlatform::SubPlatform(Neighborhood *handler) : GameInteraction(kNoradSubPlatformInteractionID, handler), _platformMovie(kPlatformMonitorID), _platformNotification(kNoradSubPlatformNotificationID, (PegasusEngine *)g_engine) { |