aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/mars/spacejunk.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2011-12-16 23:24:55 -0500
committerMatthew Hoops2011-12-16 23:24:55 -0500
commitf72884cb7bbe594888f6d14a3e03c7839ef2c508 (patch)
tree14df52c836810a427fcfdacfa71e2d54ea301a33 /engines/pegasus/neighborhood/mars/spacejunk.cpp
parent12efb47b536d2f663c9cde2739a1fd40599da669 (diff)
downloadscummvm-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/spacejunk.cpp')
-rwxr-xr-xengines/pegasus/neighborhood/mars/spacejunk.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp
index 28847136f6..9f34c21461 100755
--- a/engines/pegasus/neighborhood/mars/spacejunk.cpp
+++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp
@@ -29,15 +29,13 @@
namespace Pegasus {
-//const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale;
-//const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale;
-const CoordType kMaxBounceSize = 90;
-const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2;
-const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2;
-
-const float kJunkXTarget = 0;
-const float kJunkYTarget = 0;
-const float kJunkZTarget = kJunkMinDistance;
+static const CoordType kMaxBounceSize = 90;
+static const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2;
+static const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2;
+
+static const float kJunkXTarget = 0;
+static const float kJunkYTarget = 0;
+static const float kJunkZTarget = kJunkMinDistance;
SpaceJunk *g_spaceJunk = 0;