aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood/prehistoric/prehistoric.h
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/prehistoric/prehistoric.h
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/prehistoric/prehistoric.h')
-rwxr-xr-xengines/pegasus/neighborhood/prehistoric/prehistoric.h104
1 files changed, 52 insertions, 52 deletions
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.h b/engines/pegasus/neighborhood/prehistoric/prehistoric.h
index 786a7f7a61..2750fc0ee8 100755
--- a/engines/pegasus/neighborhood/prehistoric/prehistoric.h
+++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.h
@@ -30,73 +30,73 @@
namespace Pegasus {
-const TimeScale kPrehistoricMovieScale = 600;
-const TimeScale kPrehistoricFramesPerSecond = 15;
-const TimeScale kPrehistoricFrameDuration = 40;
+static const TimeScale kPrehistoricMovieScale = 600;
+static const TimeScale kPrehistoricFramesPerSecond = 15;
+static const TimeScale kPrehistoricFrameDuration = 40;
// Alternate IDs.
-const AlternateID kAltPrehistoricNormal = 0;
-const AlternateID kAltPrehistoricBridgeSet = 1;
+static const AlternateID kAltPrehistoricNormal = 0;
+static const AlternateID kAltPrehistoricBridgeSet = 1;
// Room IDs.
-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;
+static const RoomID kPrehistoric01 = 0;
+static const RoomID kPrehistoric02 = 1;
+static const RoomID kPrehistoric03 = 2;
+static const RoomID kPrehistoric04 = 3;
+static const RoomID kPrehistoric05 = 4;
+static const RoomID kPrehistoric06 = 5;
+static const RoomID kPrehistoric07 = 6;
+static const RoomID kPrehistoric08 = 7;
+static const RoomID kPrehistoric09 = 8;
+static const RoomID kPrehistoric10 = 9;
+static const RoomID kPrehistoric11 = 10;
+static const RoomID kPrehistoric12 = 11;
+static const RoomID kPrehistoric13 = 12;
+static const RoomID kPrehistoric14 = 13;
+static const RoomID kPrehistoric15 = 14;
+static const RoomID kPrehistoric16 = 15;
+static const RoomID kPrehistoric17 = 16;
+static const RoomID kPrehistoric18 = 17;
+static const RoomID kPrehistoric19 = 18;
+static const RoomID kPrehistoric20 = 19;
+static const RoomID kPrehistoric21 = 20;
+static const RoomID kPrehistoric22 = 21;
+static const RoomID kPrehistoric22North = 22;
+static const RoomID kPrehistoric23 = 23;
+static const RoomID kPrehistoric24 = 24;
+static const RoomID kPrehistoric25 = 25;
+static const RoomID kPrehistoricDeath = 26;
// Hot Spot Activation IDs.
-const HotSpotActivationID kActivationVaultClosed = 1;
-const HotSpotActivationID kActivationVaultOpen = 2;
+static const HotSpotActivationID kActivationVaultClosed = 1;
+static const HotSpotActivationID kActivationVaultOpen = 2;
// Hot Spot IDs.
-const HotSpotID kPre18EastSpotID = 5000;
-const HotSpotID kPre22NorthSpotID = 5001;
-const HotSpotID kPre22NorthOutSpotID = 5002;
-const HotSpotID kPre22NorthBreakerSpotID = 5003;
-const HotSpotID kPrehistoricKeyDropSpotID = 5004;
-const HotSpotID kPrehistoricHistoricalLogSpotID = 5005;
+static const HotSpotID kPre18EastSpotID = 5000;
+static const HotSpotID kPre22NorthSpotID = 5001;
+static const HotSpotID kPre22NorthOutSpotID = 5002;
+static const HotSpotID kPre22NorthBreakerSpotID = 5003;
+static const HotSpotID kPrehistoricKeyDropSpotID = 5004;
+static const HotSpotID kPrehistoricHistoricalLogSpotID = 5005;
// Extra sequence IDs.
-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;
+static const ExtraID kPreArrivalFromTSA = 0;
+static const ExtraID kPre18EastBridgeOut = 1;
+static const ExtraID kPre18EastBridgeOn = 2;
+static const ExtraID kPre18EastZoom = 3;
+static const ExtraID kPre18EastZoomOut = 4;
+static const ExtraID kPre22ThrowBreaker = 5;
+static const ExtraID kPre25EastUnlockingVaultWithLog = 6;
+static const ExtraID kPre25EastVaultOpenWithLog = 7;
+static const ExtraID kPre25EastViewWithLog = 8;
+static const ExtraID kPre25EastUnlockingVaultNoLog = 9;
+static const ExtraID kPre25EastVaultOpenNoLog = 10;
+static const ExtraID kPre25EastViewNoLog = 11;
class PegasusEngine;