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/neighborhood.h | |
| 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/neighborhood.h')
| -rw-r--r-- | engines/pegasus/neighborhood/neighborhood.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h index 7b1f86780a..93d29b6622 100644 --- a/engines/pegasus/neighborhood/neighborhood.h +++ b/engines/pegasus/neighborhood/neighborhood.h @@ -52,22 +52,22 @@ namespace Pegasus { class PegasusEngine; // Pegasus Prime neighborhood id's -const NeighborhoodID kCaldoriaID = 0; -const NeighborhoodID kFullTSAID = 1; -const NeighborhoodID kFinalTSAID = 2; -const NeighborhoodID kTinyTSAID = 3; -const NeighborhoodID kPrehistoricID = 4; -const NeighborhoodID kMarsID = 5; -const NeighborhoodID kWSCID = 6; -const NeighborhoodID kNoradAlphaID = 7; -const NeighborhoodID kNoradDeltaID = 8; +static const NeighborhoodID kCaldoriaID = 0; +static const NeighborhoodID kFullTSAID = 1; +static const NeighborhoodID kFinalTSAID = 2; +static const NeighborhoodID kTinyTSAID = 3; +static const NeighborhoodID kPrehistoricID = 4; +static const NeighborhoodID kMarsID = 5; +static const NeighborhoodID kWSCID = 6; +static const NeighborhoodID kNoradAlphaID = 7; +static const NeighborhoodID kNoradDeltaID = 8; // The sub chase is not really a neighborhood, but we define a constant that is used // to allow an easy transition out of Norad Alpha. -const NeighborhoodID kNoradSubChaseID = 1000; +static const NeighborhoodID kNoradSubChaseID = 1000; -const TimeScale kDefaultLoopFadeScale = kThirtyTicksPerSecond; -const TimeValue kDefaultLoopFadeOut = kHalfSecondPerThirtyTicks; -const TimeValue kDefaultLoopFadeIn = kHalfSecondPerThirtyTicks; +static const TimeScale kDefaultLoopFadeScale = kThirtyTicksPerSecond; +static const TimeValue kDefaultLoopFadeOut = kHalfSecondPerThirtyTicks; +static const TimeValue kDefaultLoopFadeIn = kHalfSecondPerThirtyTicks; enum QueueRequestType { kNavExtraRequest, |