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/mars/gravitoncannon.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/mars/gravitoncannon.cpp')
| -rwxr-xr-x | engines/pegasus/neighborhood/mars/gravitoncannon.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp index d383cc34ab..140bd12fc0 100755 --- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp +++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp @@ -29,22 +29,22 @@ namespace Pegasus { -const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale; +static const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale; -const CoordType kGravitonOriginH = kShuttleWindowLeft - 1; -const CoordType kGravitonOriginV = kShuttleWindowMidV; +static const CoordType kGravitonOriginH = kShuttleWindowLeft - 1; +static const CoordType kGravitonOriginV = kShuttleWindowMidV; -const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance); -const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); -const float kGravitonZOrigin = kGravitonMinDistance; +static const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance); +static const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance); +static const float kGravitonZOrigin = kGravitonMinDistance; // Width of graviton sprite... -const CoordType kGravitonMaxScreenWidth = 78; -const CoordType kGravitonMaxScreenHeight = 46; +static const CoordType kGravitonMaxScreenWidth = 78; +static const CoordType kGravitonMaxScreenHeight = 46; -const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance) +static const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance) - convertScreenHToSpaceX(kShuttleWindowMidH - kGravitonMaxScreenWidth / 2, kGravitonMinDistance); -const float kGravitonHeight = convertScreenVToSpaceY(kShuttleWindowMidV - kGravitonMaxScreenHeight / 2, kGravitonMinDistance) +static const float kGravitonHeight = convertScreenVToSpaceY(kShuttleWindowMidV - kGravitonMaxScreenHeight / 2, kGravitonMinDistance) - convertScreenVToSpaceY(kShuttleWindowMidV + kGravitonMaxScreenHeight / 2, kGravitonMinDistance); GravitonCannon::GravitonCannon() { |