[Scummvm-cvs-logs] scummvm master -> a11b52ec11790c22e694c08bf110eba889dda69c

sev- sev at scummvm.org
Sat Aug 9 16:53:30 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a11b52ec11 PEGASUS: Cleanup from unused constants.


Commit: a11b52ec11790c22e694c08bf110eba889dda69c
    https://github.com/scummvm/scummvm/commit/a11b52ec11790c22e694c08bf110eba889dda69c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-08-09T16:50:45+02:00

Commit Message:
PEGASUS: Cleanup from unused constants.

Agreed with clone2727.

Changed paths:
    engines/pegasus/energymonitor.cpp
    engines/pegasus/neighborhood/caldoria/caldoria.cpp
    engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
    engines/pegasus/neighborhood/mars/shuttlehud.cpp
    engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
    engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
    engines/pegasus/neighborhood/norad/delta/globegame.cpp
    engines/pegasus/neighborhood/norad/subcontrolroom.cpp
    engines/pegasus/neighborhood/tsa/fulltsa.cpp
    engines/pegasus/neighborhood/tsa/tinytsa.cpp
    engines/pegasus/neighborhood/wsc/wsc.cpp



diff --git a/engines/pegasus/energymonitor.cpp b/engines/pegasus/energymonitor.cpp
index 40e54af..d3cc208 100644
--- a/engines/pegasus/energymonitor.cpp
+++ b/engines/pegasus/energymonitor.cpp
@@ -68,7 +68,9 @@ void Blinker::timeChanged(const TimeValue time) {
 	}
 }
 
-static const NotificationFlags kEnergyExpiredFlag = 1;
+enum {
+	kEnergyExpiredFlag = 1
+};
 
 EnergyMonitor *g_energyMonitor = 0;
 
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 9d2d672..ed52851 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -42,109 +42,119 @@
 
 namespace Pegasus {
 
-static const int16 kVidPhoneAngle = 30;
-static const int16 kReplicatorAngle = 50;
-static const int16 kDrawersAngle = -30;
-static const int16 kCaldoria53Angle = 45;
-static const int16 kCaldoria55Angle = -45;
+enum {
+	kVidPhoneAngle = 30,
+	kReplicatorAngle = 50,
+	kDrawersAngle = -30,
+	kCaldoria53Angle = 45,
+	kCaldoria55Angle = -45
+};
 
-static const TimeValue kSinclairInterruptionTime1 = 2955;
-static const TimeValue kSinclairInterruptionTime2 = 6835;
-static const TimeValue kSinclairInterruptionTime3 = 9835;
-static const TimeValue kSinclairInterruptionTime4 = 12555;
+enum {
+	kSinclairInterruptionTime1 = 2955,
+	kSinclairInterruptionTime2 = 6835,
+	kSinclairInterruptionTime3 = 9835,
+	kSinclairInterruptionTime4 = 12555
+};
 
-static const InputBits kPullbackInterruptFilter = kFilterAllInput;
-static const InputBits kRecalibrationInterruptFilter = kFilterAllInput;
+enum {
+	kPullbackInterruptFilter = kFilterAllInput,
+	kRecalibrationInterruptFilter = kFilterAllInput
+};
 
-static const TimeValue kCaldoriaReplicatorIntroIn = 4933;
-static const TimeValue kCaldoriaReplicatorIntroOut = 6557;
+enum {
+	kCaldoriaReplicatorIntroIn = 4933,
+	kCaldoriaReplicatorIntroOut = 6557,
 
-static const TimeValue kCaldoriaReplicatorWrongChoiceIn = 6557;
-static const TimeValue kCaldoriaReplicatorWrongChoiceOut = 8586;
+	kCaldoriaReplicatorWrongChoiceIn = 6557,
+	kCaldoriaReplicatorWrongChoiceOut = 8586,
 
-static const TimeValue kCaldoriaReplicatorOJChoiceIn = 8586;
-static const TimeValue kCaldoriaReplicatorOJChoiceOut = 11687;
+	kCaldoriaReplicatorOJChoiceIn = 8586,
+	kCaldoriaReplicatorOJChoiceOut = 11687,
 
-static const TimeValue kCaldoriaMessagesIntroIn = 11687;
-static const TimeValue kCaldoriaMessagesIntroOut = 13641;
+	kCaldoriaMessagesIntroIn = 11687,
+	kCaldoriaMessagesIntroOut = 13641,
 
-static const TimeValue kCaldoriaFirstMessageIn = 13641;
-static const TimeValue kCaldoriaFirstMessageOut = 14203;
+	kCaldoriaFirstMessageIn = 13641,
+	kCaldoriaFirstMessageOut = 14203,
 
-static const TimeValue kCaldoriaSecondMessageIn = 14203;
-static const TimeValue kCaldoriaSecondMessageOut = 14750;
+	kCaldoriaSecondMessageIn = 14203,
+	kCaldoriaSecondMessageOut = 14750,
 
-static const TimeValue kCaldoriaDoorCloseIn = 14750;
-static const TimeValue kCaldoriaDoorCloseOut = 15472;
+	kCaldoriaDoorCloseIn = 14750,
+	kCaldoriaDoorCloseOut = 15472,
 
-static const TimeValue kCaldoriaElevatorCloseIn = 15472;
-static const TimeValue kCaldoriaElevatorCloseOut = 16336;
+	kCaldoriaElevatorCloseIn = 15472,
+	kCaldoriaElevatorCloseOut = 16336,
 
-static const TimeValue kCaldoriaShowerCloseIn = 16336;
-static const TimeValue kCaldoriaShowerCloseOut = 17101;
+	kCaldoriaShowerCloseIn = 16336,
+	kCaldoriaShowerCloseOut = 17101,
 
-static const TimeValue kCaldoriaGTDoorCloseIn = 17101;
-static const TimeValue kCaldoriaGTDoorCloseOut = 18523;
+	kCaldoriaGTDoorCloseIn = 17101,
+	kCaldoriaGTDoorCloseOut = 18523,
 
-static const TimeValue kCaldoriaNobodyHomeIn = 18523;
-static const TimeValue kCaldoriaNobodyHomeOut = 21469;
+	kCaldoriaNobodyHomeIn = 18523,
+	kCaldoriaNobodyHomeOut = 21469,
 
-static const TimeValue kCaldoriaNoOtherFloorIn = 21469;
-static const TimeValue kCaldoriaNoOtherFloorOut = 28013;
+	kCaldoriaNoOtherFloorIn = 21469,
+	kCaldoriaNoOtherFloorOut = 28013,
 
-static const TimeValue kCaldoria4DInstructionsIn = 28013;
-static const TimeValue kCaldoria4DInstructionsOut = 29730;
+	kCaldoria4DInstructionsIn = 28013,
+	kCaldoria4DInstructionsOut = 29730,
 
-static const TimeValue kCaldoriaDrinkOJIn = 33910;
-static const TimeValue kCaldoriaDrinkOJOut = 35846;
+	kCaldoriaDrinkOJIn = 33910,
+	kCaldoriaDrinkOJOut = 35846,
 
-static const TimeValue kCaldoriaNoOtherDestinationIn = 35846;
-static const TimeValue kCaldoriaNoOtherDestinationOut = 37877;
+	kCaldoriaNoOtherDestinationIn = 35846,
+	kCaldoriaNoOtherDestinationOut = 37877,
 
-static const TimeValue kCaldoriaUhghIn = 37877;
-static const TimeValue kCaldoriaUhghOut = 38025;
+	kCaldoriaUhghIn = 37877,
+	kCaldoriaUhghOut = 38025,
 
-static const TimeValue kCaldoriaSinclairShootsOSIn = 38025;
-static const TimeValue kCaldoriaSinclairShootsOSOut = 40649;
+	kCaldoriaSinclairShootsOSIn = 38025,
+	kCaldoriaSinclairShootsOSOut = 40649,
 
-static const TimeValue kCaldoriaScreamingAfterIn = 40649;
-static const TimeValue kCaldoriaScreamingAfterOut = 47661;
+	kCaldoriaScreamingAfterIn = 40649,
+	kCaldoriaScreamingAfterOut = 47661
+};
 
-static const TimeValue k4FloorTime = 0;
+enum {
+	k4FloorTime = 0,
 
-static const TimeValue k4To1Start = 40;
-static const TimeValue k4To1Stop = 7720;
+	k4To1Start = 40,
+	k4To1Stop = 7720,
 
-static const TimeValue k4To5Start = 7720;
-static const TimeValue k4To5Stop = 10280;
+	k4To5Start = 7720,
+	k4To5Stop = 10280,
 
-static const TimeValue k4To2Time = 10280;
+	k4To2Time = 10280,
 
-static const TimeValue k4To3Time = 10320;
+	k4To3Time = 10320,
 
-static const TimeValue k1FloorTime = 10360;
+	k1FloorTime = 10360,
 
-static const TimeValue k1To4Start = 10400;
-static const TimeValue k1To4Stop = 18080;
+	k1To4Start = 10400,
+	k1To4Stop = 18080,
 
-static const TimeValue k1To5Start = 18080;
-static const TimeValue k1To5Stop = 28320;
+	k1To5Start = 18080,
+	k1To5Stop = 28320,
 
-static const TimeValue k1To2Time = 28320;
+	k1To2Time = 28320,
 
-static const TimeValue k1To3Time = 28360;
+	k1To3Time = 28360,
 
-static const TimeValue k5FloorTime = 28400;
+	k5FloorTime = 28400,
 
-static const TimeValue k5To1Start = 28440;
-static const TimeValue k5To1Stop = 38680;
+	k5To1Start = 28440,
+	k5To1Stop = 38680,
 
-static const TimeValue k5To4Start = 38680;
-static const TimeValue k5To4Stop = 41240;
+	k5To4Start = 38680,
+	k5To4Stop = 41240,
 
-static const TimeValue k5To2Time = 41240;
+	k5To2Time = 41240,
 
-static const TimeValue k5To3Time = 41280;
+	k5To3Time = 41280
+};
 
 // FuseFunction functions...
 
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index 0494753..688fb78 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -30,34 +30,36 @@
 
 namespace Pegasus {
 
-static const TimeValue kSwitchableSlop = 3 * kCaldoriaFrameDuration;
-// Two seconds - some slop
-static const TimeValue kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop;
-// Twelve frames + some slop
-static const TimeValue kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop;
+enum {
+	kSwitchableSlop = 3 * kCaldoriaFrameDuration,
+	// Two seconds - some slop
+	kSwitchableDuration = kCaldoriaMovieScale * 2 - kSwitchableSlop,
+	// Twelve frames + some slop
+	kNonswitchableDuration = kCaldoriaFrameDuration * 12 + kSwitchableSlop,
 
-static const TimeValue kSwitchable1Start = 0;
-static const TimeValue kSwitchable1Stop = kSwitchable1Start + kSwitchableDuration;
+	kSwitchable1Start = 0,
+	kSwitchable1Stop = kSwitchable1Start + kSwitchableDuration,
 
-static const TimeValue kSwitchable2Start = kSwitchable1Stop + kNonswitchableDuration;
-static const TimeValue kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration;
+	kSwitchable2Start = kSwitchable1Stop + kNonswitchableDuration,
+	kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration,
 
-static const TimeValue kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration;
-static const TimeValue kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration;
+	kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration,
+	kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration,
 
-static const NotificationFlags kVidPhoneDoneFlag = 1;
+	kVidPhoneDoneFlag = 1,
 
-static const TimeValue kRockMusicLoopIn = 0;
-static const TimeValue kRockMusicLoopOut = 2088;
+	kRockMusicLoopIn = 0,
+	kRockMusicLoopOut = 2088,
 
-static const TimeValue kOrchestralMusicLoopIn = 2088;
-static const TimeValue kOrchestralMusicLoopOut = 4985;
+	kOrchestralMusicLoopIn = 2088,
+	kOrchestralMusicLoopOut = 4985,
 
-static const TimeValue kRhythmsMusicLoopIn = 4985;
-static const TimeValue kRhythmsMusicLoopOut = 6824;
+	kRhythmsMusicLoopIn = 4985,
+	kRhythmsMusicLoopOut = 6824,
 
-static const TimeValue kAcousticMusicLoopIn = 6824;
-static const TimeValue kAcousticMusicLoopOut = 9387;
+	kAcousticMusicLoopIn = 6824,
+	kAcousticMusicLoopOut = 9387
+};
 
 enum {
 	k4DVideoMenu,
diff --git a/engines/pegasus/neighborhood/mars/shuttlehud.cpp b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
index 11e8262..2d894f7 100644
--- a/engines/pegasus/neighborhood/mars/shuttlehud.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
@@ -30,26 +30,28 @@
 
 namespace Pegasus {
 
-static const CoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16;
-static const CoordType kHUDTargetGridTop = kShuttleWindowTop + 8;
-static const CoordType kHUDTargetGridWidth = 328;
-static const CoordType kHUDTargetGridHeight = 206;
-
-static const CoordType kHUDRS232Left = kHUDTargetGridLeft + 264;
-static const CoordType kHUDRS232Top = kHUDTargetGridTop + 2;
-
-static const CoordType kHUDLockLeft = kShuttleWindowLeft + 101;
-static const CoordType kHUDLockTop = kShuttleWindowTop + 49;
-static const CoordType kHUDLockWidth = 145;
-static const CoordType kHUDLockHeight = 124;
-
-static const CoordType kTractorLockWidth = 50;
-static const CoordType kTractorLockHeight = 30;
-
-static const CoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2;
-static const CoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2;
-static const CoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth;
-static const CoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight;
+enum {
+	kHUDTargetGridLeft = kShuttleWindowLeft + 16,
+	kHUDTargetGridTop = kShuttleWindowTop + 8,
+	kHUDTargetGridWidth = 328,
+	kHUDTargetGridHeight = 206,
+
+	kHUDRS232Left = kHUDTargetGridLeft + 264,
+	kHUDRS232Top = kHUDTargetGridTop + 2,
+
+	kHUDLockLeft = kShuttleWindowLeft + 101,
+	kHUDLockTop = kShuttleWindowTop + 49,
+	kHUDLockWidth = 145,
+	kHUDLockHeight = 124,
+
+	kTractorLockWidth = 50,
+	kTractorLockHeight = 30,
+
+	kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2,
+	kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2,
+	kTractorLockRight = kTractorLockLeft + kTractorLockWidth,
+	kTractorLockBottom = kTractorLockTop + kTractorLockHeight
+};
 
 static const uint16 s_RS232Data[] = {
 	0xF0E1, 0xCE70,
diff --git a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
index e2a0267..1478a74 100644
--- a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
@@ -45,7 +45,9 @@ static const TimeValue kSection2Start = 26;
 static const TimeValue kSection2Stop = 1000;
 
 // Seems to be a good value for a 20 second pan.
-static const CoordType kPanPixelsPerFrame = 8;
+enum {
+	kPanPixelsPerFrame = 8
+};
 
 // Interesting times are in seconds.
 static const TimeValue s_ECRInterestingTimes[] = {
diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
index 3491f16..e85a3e6 100644
--- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
@@ -65,64 +65,66 @@ static const ItemID kCO2Item = 10000;
 static const ItemID kHeItem = 10001;
 
 // Interactive points.
-static const TimeValue kFSPowerUpStartStart = 0;
-static const TimeValue kFSPowerUpStartStop = 600;
-static const TimeValue kFSSplashStart = 600;
-static const TimeValue kFSSplashStop = 7800;
-static const TimeValue kFSSplashIntakeStart = 7800;
-static const TimeValue kFSSplashIntakeStop = 18600;
-
-static const TimeValue kFSMainMenu = 18600;
-static const TimeValue kFSIntakeHiliteStart = 19200;
-static const TimeValue kFSIntakeHiliteStop = 19800;
-static const TimeValue kFSDispenseHiliteStart = 19800;
-static const TimeValue kFSDispenseHiliteStop = 20400;
-
-static const TimeValue kFSDispenseMenu = 20400;
-
-static const TimeValue kFSArHiliteStart = 21000;
-static const TimeValue kFSArHiliteStop = 21600;
-static const TimeValue kFSArAttach = 21600;
-static const TimeValue kFSArFilledStart = 22200;
-static const TimeValue kFSArFilledStop = 25200;
-static const TimeValue kFSArIncompatibleStart = 25200;
-static const TimeValue kFSArIncompatibleStop = 30000;
-
-static const TimeValue kFSCO2HiliteStart = 30000;
-static const TimeValue kFSCO2HiliteStop = 30600;
-static const TimeValue kFSCO2Attach = 30600;
-static const TimeValue kFSCO2FilledStart = 31200;
-static const TimeValue kFSCO2FilledStop = 34200;
-static const TimeValue kFSCO2IncompatibleStart = 34200;
-static const TimeValue kFSCO2IncompatibleStop = 39000;
-
-static const TimeValue kFSHeHiliteStart = 39000;
-static const TimeValue kFSHeHiliteStop = 39600;
-static const TimeValue kFSHeAttach = 39600;
-static const TimeValue kFSHeFilledStart = 40200;
-static const TimeValue kFSHeFilledStop = 43200;
-static const TimeValue kFSHeIncompatibleStart = 43200;
-static const TimeValue kFSHeIncompatibleStop = 48000;
-
-static const TimeValue kFSOHiliteStart = 48000;
-static const TimeValue kFSOHiliteStop = 48600;
-static const TimeValue kFSOAttach = 48600;
-static const TimeValue kFSOFilledStart = 49200;
-static const TimeValue kFSOFilledStop = 52200;
-static const TimeValue kFSOIncompatibleStart = 52200;
-static const TimeValue kFSOIncompatibleStop = 57000;
-
-static const TimeValue kFSNHiliteStart = 57000;
-static const TimeValue kFSNHiliteStop = 57600;
-static const TimeValue kFSNAttach = 57600;
-static const TimeValue kFSNFilledStart = 58200;
-static const TimeValue kFSNFilledStop = 61200;
-static const TimeValue kFSNIncompatibleStart = 61200;
-static const TimeValue kFSNIncompatibleStop = 66000;
-
-static const TimeValue kFSIntakeMenu = 66000;
-static const TimeValue kFSIntakeInProgressStart = 66600;
-static const TimeValue kFSIntakeInProgressStop = 69600;
+enum {
+	kFSPowerUpStartStart = 0,
+	kFSPowerUpStartStop = 600,
+	kFSSplashStart = 600,
+	kFSSplashStop = 7800,
+	kFSSplashIntakeStart = 7800,
+	kFSSplashIntakeStop = 18600,
+
+	kFSMainMenu = 18600,
+	kFSIntakeHiliteStart = 19200,
+	kFSIntakeHiliteStop = 19800,
+	kFSDispenseHiliteStart = 19800,
+	kFSDispenseHiliteStop = 20400,
+
+	kFSDispenseMenu = 20400,
+
+	kFSArHiliteStart = 21000,
+	kFSArHiliteStop = 21600,
+	kFSArAttach = 21600,
+	kFSArFilledStart = 22200,
+	kFSArFilledStop = 25200,
+	kFSArIncompatibleStart = 25200,
+	kFSArIncompatibleStop = 30000,
+
+	kFSCO2HiliteStart = 30000,
+	kFSCO2HiliteStop = 30600,
+	kFSCO2Attach = 30600,
+	kFSCO2FilledStart = 31200,
+	kFSCO2FilledStop = 34200,
+	kFSCO2IncompatibleStart = 34200,
+	kFSCO2IncompatibleStop = 39000,
+
+	kFSHeHiliteStart = 39000,
+	kFSHeHiliteStop = 39600,
+	kFSHeAttach = 39600,
+	kFSHeFilledStart = 40200,
+	kFSHeFilledStop = 43200,
+	kFSHeIncompatibleStart = 43200,
+	kFSHeIncompatibleStop = 48000,
+
+	kFSOHiliteStart = 48000,
+	kFSOHiliteStop = 48600,
+	kFSOAttach = 48600,
+	kFSOFilledStart = 49200,
+	kFSOFilledStop = 52200,
+	kFSOIncompatibleStart = 52200,
+	kFSOIncompatibleStop = 57000,
+
+	kFSNHiliteStart = 57000,
+	kFSNHiliteStop = 57600,
+	kFSNAttach = 57600,
+	kFSNFilledStart = 58200,
+	kFSNFilledStop = 61200,
+	kFSNIncompatibleStart = 61200,
+	kFSNIncompatibleStop = 66000,
+
+	kFSIntakeMenu = 66000,
+	kFSIntakeInProgressStart = 66600,
+	kFSIntakeInProgressStop = 69600
+};
 
 NoradAlphaFillingStation::NoradAlphaFillingStation(Neighborhood *owner) : GameInteraction(kNoradFillingStationInteractionID, owner),
 		_rightSideMovie(kN01RightSideID), _rightSideNotification(kNoradFillingStationNotificationID, ((PegasusEngine *)g_engine)) {
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index 5c321a8..9ea3036 100644
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -394,20 +394,22 @@ static const NotificationFlags kGlobeNotificationFlags = kGlobeSplash1Finished |
 													kGlobeTimerExpired |
 													kMaxDeactivatedFinished;
 
-static const int16 kSplash1End = 4;
-static const int16 kSplash2End = 5;
-static const int16 kSplash3Start = 8;
-static const int16 kSplash3Stop = 9;
-static const int16 kSplash4Start = 9;
-static const int16 kSplash4Stop = 10;
-static const int16 kNewLaunchSiloTime = 10;
-static const int16 kSiloDeactivatedTime = 11;
-static const int16 kMissileLaunchedTime = 12;
-static const int16 kMaxDeactivatedStart = 13;
-static const int16 kMaxDeactivatedStop = 23;
-
-static const int16 kGamePlaying = 1;
-static const int16 kGameOver = 2;
+enum {
+	kSplash1End = 4,
+	kSplash2End = 5,
+	kSplash3Start = 8,
+	kSplash3Stop = 9,
+	kSplash4Start = 9,
+	kSplash4Stop = 10,
+	kNewLaunchSiloTime = 10,
+	kSiloDeactivatedTime = 11,
+	kMissileLaunchedTime = 12,
+	kMaxDeactivatedStart = 13,
+	kMaxDeactivatedStop = 23,
+
+	kGamePlaying = 1,
+	kGameOver = 2
+};
 
 enum {
 	kGameIntro,
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index d48481e..1b14c52 100644
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -34,110 +34,113 @@ namespace Pegasus {
 
 // Right Monitor times
 
-static const TimeValue kAlphaClawSplashStart = 0;
-static const TimeValue kAlphaClawSplashStop = 4000;
-
-static const TimeValue kDeltaClawSplashStart = 4000;
-static const TimeValue kDeltaClawSplashStop = 8000;
-
-static const TimeValue kClawAtATime = 8000;
-static const TimeValue kClawAtAPinchedTime = 8600;
-static const TimeValue kClawAtATurnedTime = 9200;
-static const TimeValue kClawAtAWithRobotPinchedTime = 9800;
-
-static const TimeValue kClawAtBTime = 10400;
-static const TimeValue kClawAtBPinchedTime = 11000;
-static const TimeValue kClawAtBTurnedTime = 11600;
-static const TimeValue kClawAtBWithRobotTime = 12200;
-static const TimeValue kClawAtBWithRobotPinchedTime = 12800;
-
-static const TimeValue kClawAtCTime = 13400;
-static const TimeValue kClawAtCPinchedTime = 14000;
-static const TimeValue kClawAtCTurnedTime = 14600;
-
-static const TimeValue kClawAtDTime = 15200;
-static const TimeValue kClawAtDPinchedTime = 15800;
-static const TimeValue kClawAtDTurnedTime = 16400;
-
-static const TimeValue kAToBStart = 17000;
-static const TimeValue kAToBStop = 18680;
-static const TimeValue kAPinchStart = 18680;
-static const TimeValue kAPinchStop = 20200;
-static const TimeValue kACCWStart = 20200;
-static const TimeValue kACCWStop = 21600;
-static const TimeValue kACWStart = 21600;
-static const TimeValue kACWStop = 23000;
-
-static const TimeValue kBToAStart = 23000;
-static const TimeValue kBToAStop = 24680;
-static const TimeValue kBToCStart = 24680;
-static const TimeValue kBToCStop = 26520;
-static const TimeValue kBToDStart = 26520;
-static const TimeValue kBToDStop = 28320;
-static const TimeValue kBPinchStart = 28320;
-static const TimeValue kBPinchStop = 29680;
-static const TimeValue kBCCWStart = 29680;
-static const TimeValue kBCCWStop = 31200;
-static const TimeValue kBCWStart = 31200;
-static const TimeValue kBCWStop = 32720;
-
-static const TimeValue kCToBStart = 32720;
-static const TimeValue kCToBStop = 34560;
-static const TimeValue kCPinchStart = 34560;
-static const TimeValue kCPinchStop = 36400;
-static const TimeValue kCCCWStart = 36400;
-static const TimeValue kCCCWStop = 37840;
-static const TimeValue kCCWStart = 37840;
-static const TimeValue kCCWStop = 39280;
-
-static const TimeValue kDToBStart = 39280;
-static const TimeValue kDToBStop = 41080;
-static const TimeValue kDPinchStart = 41080;
-static const TimeValue kDPinchStop = 42600;
-static const TimeValue kDCCWStart = 42600;
-static const TimeValue kDCCWStop = 44000;
-static const TimeValue kDCWStart = 44000;
-static const TimeValue kDCWStop = 45400;
-
-static const TimeValue kRobotApproachStart = 45400;
-static const TimeValue kRobotApproachStop = 56800;
-
-static const TimeValue kCToBWithRobotStart = 56800;
-static const TimeValue kCToBWithRobotStop = 58600;
-
-static const TimeValue kBPinchWithRobotStart = 58600;
-static const TimeValue kBPinchWithRobotStop = 60400;
-static const TimeValue kBToAWithRobotStart = 60400;
-static const TimeValue kBToAWithRobotStop = 62240;
+enum {
+	kAlphaClawSplashStart = 0,
+	kAlphaClawSplashStop = 4000,
+
+	kDeltaClawSplashStart = 4000,
+	kDeltaClawSplashStop = 8000,
+
+	kClawAtATime = 8000,
+	kClawAtAPinchedTime = 8600,
+	kClawAtATurnedTime = 9200,
+	kClawAtAWithRobotPinchedTime = 9800,
+
+	kClawAtBTime = 10400,
+	kClawAtBPinchedTime = 11000,
+	kClawAtBTurnedTime = 11600,
+	kClawAtBWithRobotTime = 12200,
+	kClawAtBWithRobotPinchedTime = 12800,
+
+	kClawAtCTime = 13400,
+	kClawAtCPinchedTime = 14000,
+	kClawAtCTurnedTime = 14600,
+
+	kClawAtDTime = 15200,
+	kClawAtDPinchedTime = 15800,
+	kClawAtDTurnedTime = 16400,
+
+	kAToBStart = 17000,
+	kAToBStop = 18680,
+	kAPinchStart = 18680,
+	kAPinchStop = 20200,
+	kACCWStart = 20200,
+	kACCWStop = 21600,
+	kACWStart = 21600,
+	kACWStop = 23000,
+
+	kBToAStart = 23000,
+	kBToAStop = 24680,
+	kBToCStart = 24680,
+	kBToCStop = 26520,
+	kBToDStart = 26520,
+	kBToDStop = 28320,
+	kBPinchStart = 28320,
+	kBPinchStop = 29680,
+	kBCCWStart = 29680,
+	kBCCWStop = 31200,
+	kBCWStart = 31200,
+	kBCWStop = 32720,
+
+	kCToBStart = 32720,
+	kCToBStop = 34560,
+	kCPinchStart = 34560,
+	kCPinchStop = 36400,
+	kCCCWStart = 36400,
+	kCCCWStop = 37840,
+	kCCWStart = 37840,
+	kCCWStop = 39280,
+
+	kDToBStart = 39280,
+	kDToBStop = 41080,
+	kDPinchStart = 41080,
+	kDPinchStop = 42600,
+	kDCCWStart = 42600,
+	kDCCWStop = 44000,
+	kDCWStart = 44000,
+	kDCWStop = 45400,
+
+	kRobotApproachStart = 45400,
+	kRobotApproachStop = 56800,
+
+	kCToBWithRobotStart = 56800,
+	kCToBWithRobotStop = 58600,
+
+	kBPinchWithRobotStart = 58600,
+	kBPinchWithRobotStop = 60400,
+	kBToAWithRobotStart = 60400,
+	kBToAWithRobotStop = 62240
+};
 
 // As usual, times here are in seconds.
 
 // Left monitor times.
+enum {
+	kAlphaSplashStart = 0,
+	kAlphaSplashStop = 2,
 
-static const TimeValue kAlphaSplashStart = 0;
-static const TimeValue kAlphaSplashStop = 2;
-
-static const TimeValue kMainMenuTime = 2;
-static const TimeValue kLaunchPrepRolloverTime = 3;
-static const TimeValue kLaunchPrepHighlightStart = 4;
-static const TimeValue kLaunchPrepHighlightStop = 5;
-static const TimeValue kClawControlRolloverTime = 5;
-static const TimeValue kClawControlHighlightStart = 6;
-static const TimeValue kClawControlHighlightStop = 7;
+	kMainMenuTime = 2,
+	kLaunchPrepRolloverTime = 3,
+	kLaunchPrepHighlightStart = 4,
+	kLaunchPrepHighlightStop = 5,
+	kClawControlRolloverTime = 5,
+	kClawControlHighlightStart = 6,
+	kClawControlHighlightStop = 7,
 
-static const TimeValue kAlphaLaunchPrepStart = 7;
-static const TimeValue kAlphaLaunchPrepStop = 17;
+	kAlphaLaunchPrepStart = 7,
+	kAlphaLaunchPrepStop = 17,
 
-static const TimeValue kClawMenuStart = 17;
-static const TimeValue kClawMenuStop = 18;
+	kClawMenuStart = 17,
+	kClawMenuStop = 18,
 
-static const TimeValue kClawMenuTime = 18;
+	kClawMenuTime = 18,
 
-static const TimeValue kDeltaSplashStart = 19;
-static const TimeValue kDeltaSplashStop = 21;
+	kDeltaSplashStart = 19,
+	kDeltaSplashStop = 21,
 
-static const TimeValue kDeltaLaunchPrepStart = 21;
-static const TimeValue kDeltaLaunchPrepStop = 30;
+	kDeltaLaunchPrepStart = 21,
+	kDeltaLaunchPrepStop = 30
+};
 
 // Right monitor times.
 
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 92b79c0..f7996fa 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -41,41 +41,45 @@ namespace Pegasus {
 
 // TSA PICTs:
 
-static const ResIDType kTBPCloseBoxPICTID = 800;
-static const ResIDType kTBPRewindPICTID = 801;
-static const ResIDType kUnresolvedPICTID = 802;
-static const ResIDType kResolvedPICTID = 803;
-static const ResIDType kJumpMenuPICTID = 804;
-static const ResIDType kJumpMenuHilitedPICTID = 805;
-static const ResIDType kExitPICTID = 806;
-static const ResIDType kExitHilitedPICTID = 807;
-static const ResIDType kLeftRipPICTID = 808;
-static const ResIDType kComparisonCloseBoxPICTID = 809;
-static const ResIDType kComparisonLeftRewindPICTID = 810;
-static const ResIDType kComparisonRightRewindPICTID = 811;
-static const ResIDType kComparisonHiliteNoradPICTID = 812;
-static const ResIDType kComparisonHiliteMarsPICTID = 813;
-static const ResIDType kComparisonHiliteCaldoriaPICTID = 814;
-static const ResIDType kComparisonHiliteWSCPICTID = 815;
-static const ResIDType kComparisonChancesNoradPICTID = 816;
-static const ResIDType kComparisonChancesMarsPICTID = 817;
-static const ResIDType kComparisonChancesCaldoriaPICTID = 818;
-static const ResIDType kComparisonChancesWSCPICTID = 819;
-static const ResIDType kRedirectionCCRolloverPICTID = 820;
-static const ResIDType kRedirectionRRRolloverPICTID = 821;
-static const ResIDType kRedirectionFDRolloverPICTID = 822;
-static const ResIDType kRedirectionCCDoorPICTID = 823;
-static const ResIDType kRedirectionRRDoorPICTID = 824;
-static const ResIDType kRedirectionFDDoorPICTID = 825;
-static const ResIDType kRedirectionSecuredPICTID = 826;
-static const ResIDType kRedirectionNewTargetPICTID = 827;
-static const ResIDType kRedirectionClosePICTID = 828;
+enum {
+	kTBPCloseBoxPICTID = 800,
+	kTBPRewindPICTID = 801,
+	kUnresolvedPICTID = 802,
+	kResolvedPICTID = 803,
+	kJumpMenuPICTID = 804,
+	kJumpMenuHilitedPICTID = 805,
+	kExitPICTID = 806,
+	kExitHilitedPICTID = 807,
+	kLeftRipPICTID = 808,
+	kComparisonCloseBoxPICTID = 809,
+	kComparisonLeftRewindPICTID = 810,
+	kComparisonRightRewindPICTID = 811,
+	kComparisonHiliteNoradPICTID = 812,
+	kComparisonHiliteMarsPICTID = 813,
+	kComparisonHiliteCaldoriaPICTID = 814,
+	kComparisonHiliteWSCPICTID = 815,
+	kComparisonChancesNoradPICTID = 816,
+	kComparisonChancesMarsPICTID = 817,
+	kComparisonChancesCaldoriaPICTID = 818,
+	kComparisonChancesWSCPICTID = 819,
+	kRedirectionCCRolloverPICTID = 820,
+	kRedirectionRRRolloverPICTID = 821,
+	kRedirectionFDRolloverPICTID = 822,
+	kRedirectionCCDoorPICTID = 823,
+	kRedirectionRRDoorPICTID = 824,
+	kRedirectionFDDoorPICTID = 825,
+	kRedirectionSecuredPICTID = 826,
+	kRedirectionNewTargetPICTID = 827,
+	kRedirectionClosePICTID = 828
+};
 
 static const int16 kCompassShift = 15;
 
-static const TimeScale kFullTSAMovieScale = 600;
-static const TimeScale kFullTSAFramesPerSecond = 15;
-static const TimeScale kFullTSAFrameDuration = 40;
+enum {
+	kFullTSAMovieScale = 600,
+	kFullTSAFramesPerSecond = 15,
+	kFullTSAFrameDuration = 40
+};
 
 // Alternate IDs.
 static const AlternateID kAltTSANormal = 0;
@@ -84,416 +88,425 @@ static const AlternateID kAltTSARobotsAtFrontDoor = 2;
 static const AlternateID kAltTSARedAlert = 3;
 
 // Room IDs.
-static const RoomID kTSA01 = 1;
-static const RoomID kTSA02 = 2;
-static const RoomID kTSA03 = 3;
-static const RoomID kTSA04 = 4;
-static const RoomID kTSA05 = 5;
-static const RoomID kTSA0A = 6;
-static const RoomID kTSA06 = 7;
-static const RoomID kTSA07 = 8;
-static const RoomID kTSA08 = 9;
-static const RoomID kTSA09 = 10;
-static const RoomID kTSA10 = 11;
-static const RoomID kTSA11 = 12;
-static const RoomID kTSA12 = 13;
-static const RoomID kTSA13 = 14;
-static const RoomID kTSA14 = 15;
-static const RoomID kTSA15 = 16;
-static const RoomID kTSA16 = 17;
-static const RoomID kTSA17 = 18;
-static const RoomID kTSA18 = 19;
-static const RoomID kTSA19 = 20;
-static const RoomID kTSA0B = 21;
-static const RoomID kTSA21Cyan = 22;
-static const RoomID kTSA22Cyan = 23;
-static const RoomID kTSA23Cyan = 24;
-static const RoomID kTSA24Cyan = 25;
-static const RoomID kTSA25Cyan = 26;
-static const RoomID kTSA21Red = 27;
-static const RoomID kTSA23Red = 29;
-static const RoomID kTSA24Red = 30;
-static const RoomID kTSA25Red = 31;
-static const RoomID kTSA26 = 32;
-static const RoomID kTSA27 = 33;
-static const RoomID kTSA28 = 34;
-static const RoomID kTSA29 = 35;
-static const RoomID kTSA30 = 36;
-static const RoomID kTSA31 = 37;
-static const RoomID kTSA32 = 38;
-static const RoomID kTSA33 = 39;
-static const RoomID kTSA34 = 40;
-static const RoomID kTSA35 = 41;
-static const RoomID kTSADeathRoom = 43;
+enum {
+	kTSA01 = 1,
+	kTSA02 = 2,
+	kTSA03 = 3,
+	kTSA04 = 4,
+	kTSA05 = 5,
+	kTSA0A = 6,
+	kTSA06 = 7,
+	kTSA07 = 8,
+	kTSA08 = 9,
+	kTSA09 = 10,
+	kTSA10 = 11,
+	kTSA11 = 12,
+	kTSA12 = 13,
+	kTSA13 = 14,
+	kTSA14 = 15,
+	kTSA15 = 16,
+	kTSA16 = 17,
+	kTSA17 = 18,
+	kTSA18 = 19,
+	kTSA19 = 20,
+	kTSA0B = 21,
+	kTSA21Cyan = 22,
+	kTSA22Cyan = 23,
+	kTSA23Cyan = 24,
+	kTSA24Cyan = 25,
+	kTSA25Cyan = 26,
+	kTSA21Red = 27,
+	kTSA23Red = 29,
+	kTSA24Red = 30,
+	kTSA25Red = 31,
+	kTSA26 = 32,
+	kTSA27 = 33,
+	kTSA28 = 34,
+	kTSA29 = 35,
+	kTSA30 = 36,
+	kTSA31 = 37,
+	kTSA32 = 38,
+	kTSA33 = 39,
+	kTSA34 = 40,
+	kTSA35 = 41,
+	kTSADeathRoom = 43
+};
 
 // Hot Spot Activation IDs.
-static const HotSpotActivationID kActivateTSAReadyForCard = 1;
-static const HotSpotActivationID kActivateTSAReadyToTransport = 2;
-static const HotSpotActivationID kActivateTSARobotsAwake = 3;
-static const HotSpotActivationID kActivateTSA0BZoomedOut = 4;
-static const HotSpotActivationID kActivateTSA0BZoomedIn = 5;
-static const HotSpotActivationID kActivateTSA0BComparisonVideo = 6;
-static const HotSpotActivationID kActivationLogReaderOpen = 7;
-static const HotSpotActivationID kActivateTSA0BTBPVideo = 8;
-static const HotSpotActivationID kActivationDoesntHaveKey = 9;
-static const HotSpotActivationID kActivationKeyVaultOpen = 10;
-static const HotSpotActivationID kActivationDoesntHaveChips = 11;
-static const HotSpotActivationID kActivationChipVaultOpen = 12;
-static const HotSpotActivationID kActivationJumpToPrehistoric = 13;
-static const HotSpotActivationID kActivationJumpToNorad = 14;
-static const HotSpotActivationID kActivationJumpToMars = 15;
-static const HotSpotActivationID kActivationJumpToWSC = 16;
-static const HotSpotActivationID kActivationReadyToExit = 17;
-static const HotSpotActivationID kActivationReadyForJumpMenu = 18;
-static const HotSpotActivationID kActivationMainJumpMenu = 19;
+enum {
+	kActivateTSAReadyForCard = 1,
+	kActivateTSAReadyToTransport = 2,
+	kActivateTSARobotsAwake = 3,
+	kActivateTSA0BZoomedOut = 4,
+	kActivateTSA0BZoomedIn = 5,
+	kActivateTSA0BComparisonVideo = 6,
+	kActivationLogReaderOpen = 7,
+	kActivateTSA0BTBPVideo = 8,
+	kActivationDoesntHaveKey = 9,
+	kActivationKeyVaultOpen = 10,
+	kActivationDoesntHaveChips = 11,
+	kActivationChipVaultOpen = 12,
+	kActivationJumpToPrehistoric = 13,
+	kActivationJumpToNorad = 14,
+	kActivationJumpToMars = 15,
+	kActivationJumpToWSC = 16,
+	kActivationReadyToExit = 17,
+	kActivationReadyForJumpMenu = 18,
+	kActivationMainJumpMenu = 19
+};
 
 // Hot Spot IDs.
-static const HotSpotID kTSAGTCardDropSpotID = 5000;
-static const HotSpotID kTSAGTTokyoSpotID = 5001;
-static const HotSpotID kTSAGTCaldoriaSpotID = 5002;
-static const HotSpotID kTSAGTBeachSpotID = 5003;
-static const HotSpotID kTSAGTOtherSpotID = 5004;
-static const HotSpotID kTSA02DoorSpotID = 5005;
-static const HotSpotID kTSA03EastJimenezSpotID = 5006;
-static const HotSpotID kTSA03WestCrenshawSpotID = 5007;
-static const HotSpotID kTSA04EastMatsumotoSpotID = 5008;
-static const HotSpotID kTSA04WestCastilleSpotID = 5009;
-static const HotSpotID kTSA05EastSinclairSpotID = 5010;
-static const HotSpotID kTSA05WestWhiteSpotID = 5011;
-static const HotSpotID kTSA0AEastSpotID = 5012;
-static const HotSpotID kTSA0AWastSpotID = 5013;
-static const HotSpotID kTSA0BEastMonitorSpotID = 5014;
-static const HotSpotID kTSA0BEastMonitorOutSpotID = 5015;
-static const HotSpotID kTSA0BEastCompareNoradSpotID = 5016;
-static const HotSpotID kTSA0BEastCompareMarsSpotID = 5017;
-static const HotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018;
-static const HotSpotID kTSA0BEastCompareWSCSpotID = 5019;
-static const HotSpotID kTSA0BEastLeftRewindSpotID = 5020;
-static const HotSpotID kTSA0BEastLeftPlaySpotID = 5021;
-static const HotSpotID kTSA0BEastRightRewindSpotID = 5022;
-static const HotSpotID kTSA0BEastRightPlaySpotID = 5023;
-static const HotSpotID kTSA0BEastCloseVideoSpotID = 5024;
-static const HotSpotID kTSA0BNorthMonitorSpotID = 5025;
-static const HotSpotID kTSA0BNorthMonitorOutSpotID = 5026;
-static const HotSpotID kTSA0BNorthHistLogSpotID = 5027;
-static const HotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028;
-static const HotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029;
-static const HotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030;
-static const HotSpotID kTSA0BWestMonitorSpotID = 5031;
-static const HotSpotID kTSA0BWestMonitorOutSpotID = 5032;
-static const HotSpotID kTSA0BWestTheorySpotID = 5033;
-static const HotSpotID kTSA0BWestBackgroundSpotID = 5034;
-static const HotSpotID kTSA0BWestProcedureSpotID = 5035;
-static const HotSpotID kTSA0BWestCloseVideoSpotID = 5036;
-static const HotSpotID kTSA0BWestPlayVideoSpotID = 5037;
-static const HotSpotID kTSA0BWestRewindVideoSpotID = 5038;
-static const HotSpotID kTSA22EastMonitorSpotID = 5039;
-static const HotSpotID kTSA22EastKeySpotID = 5040;
-static const HotSpotID kTSA23WestMonitorSpotID = 5041;
-static const HotSpotID kTSA23WestChipsSpotID = 5042;
-static const HotSpotID kTSA34NorthDoorSpotID = 5043;
-static const HotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044;
-static const HotSpotID kTSA37NorthJumpToNoradSpotID = 5045;
-static const HotSpotID kTSA37NorthCancelNoradSpotID = 5046;
-static const HotSpotID kTSA37NorthJumpToMarsSpotID = 5047;
-static const HotSpotID kTSA37NorthCancelMarsSpotID = 5048;
-static const HotSpotID kTSA37NorthJumpToWSCSpotID = 5049;
-static const HotSpotID kTSA37NorthCancelWSCSpotID = 5050;
-static const HotSpotID kTSA37NorthExitSpotID = 5051;
-static const HotSpotID kTSA37NorthJumpMenuSpotID = 5052;
-static const HotSpotID kTSA37NorthNoradMenuSpotID = 5053;
-static const HotSpotID kTSA37NorthMarsMenuSpotID = 5054;
-static const HotSpotID kTSA37NorthWSCMenuSpotID = 5055;
+enum {
+	kTSAGTCardDropSpotID = 5000,
+	kTSAGTTokyoSpotID = 5001,
+	kTSAGTCaldoriaSpotID = 5002,
+	kTSAGTBeachSpotID = 5003,
+	kTSAGTOtherSpotID = 5004,
+	kTSA02DoorSpotID = 5005,
+	kTSA03EastJimenezSpotID = 5006,
+	kTSA03WestCrenshawSpotID = 5007,
+	kTSA04EastMatsumotoSpotID = 5008,
+	kTSA04WestCastilleSpotID = 5009,
+	kTSA05EastSinclairSpotID = 5010,
+	kTSA05WestWhiteSpotID = 5011,
+	kTSA0AEastSpotID = 5012,
+	kTSA0AWastSpotID = 5013,
+	kTSA0BEastMonitorSpotID = 5014,
+	kTSA0BEastMonitorOutSpotID = 5015,
+	kTSA0BEastCompareNoradSpotID = 5016,
+	kTSA0BEastCompareMarsSpotID = 5017,
+	kTSA0BEastCompareCaldoriaSpotID = 5018,
+	kTSA0BEastCompareWSCSpotID = 5019,
+	kTSA0BEastLeftRewindSpotID = 5020,
+	kTSA0BEastLeftPlaySpotID = 5021,
+	kTSA0BEastRightRewindSpotID = 5022,
+	kTSA0BEastRightPlaySpotID = 5023,
+	kTSA0BEastCloseVideoSpotID = 5024,
+	kTSA0BNorthMonitorSpotID = 5025,
+	kTSA0BNorthMonitorOutSpotID = 5026,
+	kTSA0BNorthHistLogSpotID = 5027,
+	kTSA0BNorthRobotsToCommandCenterSpotID = 5028,
+	kTSA0BNorthRobotsToReadyRoomSpotID = 5029,
+	kTSA0BNorthRobotsToFrontDoorSpotID = 5030,
+	kTSA0BWestMonitorSpotID = 5031,
+	kTSA0BWestMonitorOutSpotID = 5032,
+	kTSA0BWestTheorySpotID = 5033,
+	kTSA0BWestBackgroundSpotID = 5034,
+	kTSA0BWestProcedureSpotID = 5035,
+	kTSA0BWestCloseVideoSpotID = 5036,
+	kTSA0BWestPlayVideoSpotID = 5037,
+	kTSA0BWestRewindVideoSpotID = 5038,
+	kTSA22EastMonitorSpotID = 5039,
+	kTSA22EastKeySpotID = 5040,
+	kTSA23WestMonitorSpotID = 5041,
+	kTSA23WestChipsSpotID = 5042,
+	kTSA34NorthDoorSpotID = 5043,
+	kTSA37NorthJumpToPrehistoricSpotID = 5044,
+	kTSA37NorthJumpToNoradSpotID = 5045,
+	kTSA37NorthCancelNoradSpotID = 5046,
+	kTSA37NorthJumpToMarsSpotID = 5047,
+	kTSA37NorthCancelMarsSpotID = 5048,
+	kTSA37NorthJumpToWSCSpotID = 5049,
+	kTSA37NorthCancelWSCSpotID = 5050,
+	kTSA37NorthExitSpotID = 5051,
+	kTSA37NorthJumpMenuSpotID = 5052,
+	kTSA37NorthNoradMenuSpotID = 5053,
+	kTSA37NorthMarsMenuSpotID = 5054,
+	kTSA37NorthWSCMenuSpotID = 5055
+};
 
 // Extra sequence IDs.
-static const ExtraID kTSATransporterArrowLoop = 0;
-static const ExtraID kTSAArriveFromCaldoria = 1;
-static const ExtraID kTSAGTOtherChoice = 2;
-static const ExtraID kTSAGTCardSwipe = 3;
-static const ExtraID kTSAGTSelectCaldoria = 4;
-static const ExtraID kTSAGTGoToCaldoria = 5;
-static const ExtraID kTSAGTSelectBeach = 6;
-static const ExtraID kTSAGTGoToBeach = 7;
-static const ExtraID kTSAGTArriveAtBeach = 8;
-static const ExtraID kTSAGTSelectTokyo = 9;
-static const ExtraID kTSAGTGoToTokyo = 10;
-static const ExtraID kTSAGTArriveAtTokyo = 11;
-static const ExtraID kTSA02NorthZoomIn = 12;
-static const ExtraID kTSA02NorthTenSecondDoor = 13;
-static const ExtraID kTSA02NorthZoomOut = 14;
-static const ExtraID kTSA02NorthDoorWithAgent3 = 15;
-static const ExtraID kTSA03JimenezZoomIn = 16;
-static const ExtraID kTSA03JimenezSpeech = 17;
-static const ExtraID kTSA03JimenezZoomOut = 18;
-static const ExtraID kTSA03CrenshawZoomIn = 19;
-static const ExtraID kTSA03CrenshawSpeech = 20;
-static const ExtraID kTSA03CrenshawZoomOut = 21;
-static const ExtraID kTSA03SouthRobotDeath = 22;
-static const ExtraID kTSA04NorthRobotGreeting = 23;
-static const ExtraID kTSA04MatsumotoZoomIn = 24;
-static const ExtraID kTSA04MatsumotoSpeech = 25;
-static const ExtraID kTSA04MatsumotoZoomOut = 26;
-static const ExtraID kTSA04CastilleZoomIn = 27;
-static const ExtraID kTSA04CastilleSpeech = 28;
-static const ExtraID kTSA04CastilleZoomOut = 29;
-static const ExtraID kTSA05SinclairZoomIn = 30;
-static const ExtraID kTSA05SinclairSpeech = 31;
-static const ExtraID kTSA05SinclairZoomOut = 32;
-static const ExtraID kTSA05WhiteZoomIn = 33;
-static const ExtraID kTSA05WhiteSpeech = 34;
-static const ExtraID kTSA05WhiteZoomOut = 35;
-static const ExtraID kTSA0AEastRobot = 36;
-static const ExtraID kTSA0AWestRobot = 37;
-static const ExtraID kTSA16NorthRobotDeath = 38;
-static const ExtraID kTSA0BEastZoomIn = 39;
-static const ExtraID kTSA0BEastZoomedView = 40;
-static const ExtraID kTSA0BEastZoomOut = 41;
-static const ExtraID kTSA0BEastTurnLeft = 42;
-static const ExtraID kTSA0BComparisonStartup = 43;
-static const ExtraID kTSA0BComparisonView0000 = 44;
-static const ExtraID kTSA0BComparisonView0002 = 45;
-static const ExtraID kTSA0BComparisonView0020 = 46;
-static const ExtraID kTSA0BComparisonView0022 = 47;
-static const ExtraID kTSA0BComparisonView0200 = 48;
-static const ExtraID kTSA0BComparisonView0202 = 49;
-static const ExtraID kTSA0BComparisonView0220 = 50;
-static const ExtraID kTSA0BComparisonView0222 = 51;
-static const ExtraID kTSA0BComparisonView2000 = 52;
-static const ExtraID kTSA0BComparisonView2002 = 53;
-static const ExtraID kTSA0BComparisonView2020 = 54;
-static const ExtraID kTSA0BComparisonView2022 = 55;
-static const ExtraID kTSA0BComparisonView2200 = 56;
-static const ExtraID kTSA0BComparisonView2202 = 57;
-static const ExtraID kTSA0BComparisonView2220 = 58;
-static const ExtraID kTSA0BComparisonView2222 = 59;
-static const ExtraID kTSA0BNoradComparisonView = 60;
-static const ExtraID kTSA0BNoradUnaltered = 61;
-static const ExtraID kTSA0BNoradAltered = 62;
-static const ExtraID kTSA0BMarsComparisonView = 63;
-static const ExtraID kTSA0BMarsUnaltered = 64;
-static const ExtraID kTSA0BMarsAltered = 65;
-static const ExtraID kTSA0BWSCComparisonView = 66;
-static const ExtraID kTSA0BWSCUnaltered = 67;
-static const ExtraID kTSA0BWSCAltered = 68;
-static const ExtraID kTSA0BCaldoriaComparisonView = 69;
-static const ExtraID kTSA0BCaldoriaUnaltered = 70;
-static const ExtraID kTSA0BCaldoriaAltered = 71;
-static const ExtraID kTSA0BNorthZoomIn = 72;
-static const ExtraID kTSA0BNorthZoomedView = 73;
-static const ExtraID kTSA0BNorthZoomOut = 74;
-static const ExtraID kTSA0BNorthTurnLeft = 75;
-static const ExtraID kTSA0BNorthTurnRight = 76;
-static const ExtraID kTSA0BNorthHistLogOpen = 77;
-static const ExtraID kTSA0BNorthHistLogClose = 78;
-static const ExtraID kTSA0BNorthHistLogCloseWithLog = 79;
-static const ExtraID kTSA0BNorthCantChangeHistory = 80;
-static const ExtraID kTSA0BNorthYoureBusted = 81;
-static const ExtraID kTSA0BNorthFinallyHappened = 82;
-static const ExtraID kTSA0BShowRip1 = 83;
-static const ExtraID kTSA0BNorthRipView1 = 84;
-static const ExtraID kTSA0BShowRip2 = 85;
-static const ExtraID kTSA0BShowGuardRobots = 86;
-static const ExtraID kTSA0BAIInterruption = 87;
-static const ExtraID kTSA0BRobotsToCommandCenter = 88;
-static const ExtraID kTSA0BNorthRobotsAtCCView = 89;
-static const ExtraID kTSA0BNorthRobotsAtRRView = 90;
-static const ExtraID kTSA0BNorthRobotsAtFDView = 91;
-static const ExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92;
-static const ExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93;
-static const ExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94;
-static const ExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95;
-static const ExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96;
-static const ExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97;
-static const ExtraID kTSA0BWestZoomIn = 98;
-static const ExtraID kTSA0BWestZoomedView = 99;
-static const ExtraID kTSA0BWestZoomOut = 100;
-static const ExtraID kTSA0BWestTurnRight = 101;
-static const ExtraID kTSA0BTBPTheoryHighlight = 102;
-static const ExtraID kTSA0BTBPBackgroundHighlight = 103;
-static const ExtraID kTSA0BTBPProcedureHighlight = 104;
-static const ExtraID kTSA0BTBPTheory = 105;
-static const ExtraID kTSA0BTBPBackground = 106;
-static const ExtraID kTSA0BTBPProcedure = 107;
-static const ExtraID kTSA0BRipAlarmScreen = 108;
-static const ExtraID kTSA22RedEastZoomInSequence = 109;
-static const ExtraID kTSA22RedEastVaultViewWithKey = 110;
-static const ExtraID kTSA22RedEastVaultViewNoKey = 111;
-static const ExtraID kTSA23RedWestVaultZoomInSequence = 112;
-static const ExtraID kTSA23RedWestVaultViewWithChips = 113;
-static const ExtraID kTSA23RedWestVaultViewNoChips = 114;
-static const ExtraID kTSA25NorthDeniedNoKey = 115;
-static const ExtraID kTSA25NorthDeniedNoChip = 116;
-static const ExtraID kTSA25NorthPutOnSuit = 117;
-static const ExtraID kTSA25NorthAlreadyHaveSuit = 118;
-static const ExtraID kTSA25NorthDescending1 = 119;
-static const ExtraID kTSA25NorthDescending2 = 120;
-static const ExtraID kTSA37HorseToAI1 = 121;
-static const ExtraID kTSA37PegasusAI1 = 122;
-static const ExtraID kTSA37AI1ToCommissioner1 = 123;
-static const ExtraID kTSA37Commissioner1 = 124;
-static const ExtraID kTSA37Commissioner1ToZoom = 125;
-static const ExtraID kTSA37ZoomToPrehistoric = 126;
-static const ExtraID kTSA37PrehistoricToAI2 = 127;
-static const ExtraID kTSA37PegasusAI2 = 128;
-static const ExtraID kTSA37AI2ToPrehistoric = 129;
-static const ExtraID kTSA37PrehistoricToDepart = 130;
-static const ExtraID kTSA37PegasusDepart = 131;
-static const ExtraID kTSA37TimeJumpToPegasus = 132;
-static const ExtraID kTSA37RecallToDownload = 133;
-static const ExtraID kTSA37DownloadToColonel1 = 134;
-static const ExtraID kTSA37Colonel1 = 135;
-static const ExtraID kTSA37Colonel1ToReviewRequired = 136;
-static const ExtraID kTSA37ReviewRequiredToExit = 137;
-static const ExtraID kTSA37ExitHilited = 138;
-static const ExtraID kTSA37ExitToHorse = 139;
-static const ExtraID kTSA37HorseToColonel2 = 140;
-static const ExtraID kTSA37Colonel2 = 141;
-static const ExtraID kTSA37PegasusAI3 = 142;
-static const ExtraID kTSA37AI3ToHorse = 143;
-static const ExtraID kTSA37HorseToZoom = 144;
-static const ExtraID kTSA37ZoomToMainMenu = 145;
-static const ExtraID kTSA37MainMenuToAI4 = 146;
-static const ExtraID kTSA37PegasusAI4 = 147;
-static const ExtraID kTSA37AI4ToMainMenu = 148;
-static const ExtraID kTSA37JumpMenu000 = 149;
-static const ExtraID kTSA37JumpMenu001 = 150;
-static const ExtraID kTSA37JumpMenu010 = 151;
-static const ExtraID kTSA37JumpMenu011 = 152;
-static const ExtraID kTSA37JumpMenu100 = 153;
-static const ExtraID kTSA37JumpMenu101 = 154;
-static const ExtraID kTSA37JumpMenu110 = 155;
-static const ExtraID kTSA37JumpMenu111 = 156;
-static const ExtraID kTSA37JumpToWSCMenu = 157;
-static const ExtraID kTSA37CancelWSC = 158;
-static const ExtraID kTSA37JumpToWSC = 159;
-static const ExtraID kTSA37WSCToAI5 = 160;
-static const ExtraID kTSA37PegasusAI5 = 161;
-static const ExtraID kTSA37AI5ToWSC = 162;
-static const ExtraID kTSA37WSCToDepart = 163;
-static const ExtraID kTSA37JumpToMarsMenu = 164;
-static const ExtraID kTSA37CancelMars = 165;
-static const ExtraID kTSA37JumpToMars = 166;
-static const ExtraID kTSA37MarsToAI6 = 167;
-static const ExtraID kTSA37PegasusAI6 = 168;
-static const ExtraID kTSA37AI6ToMars = 169;
-static const ExtraID kTSA37MarsToDepart = 170;
-static const ExtraID kTSA37JumpToNoradMenu = 171;
-static const ExtraID kTSA37CancelNorad = 172;
-static const ExtraID kTSA37JumpToNorad = 173;
-static const ExtraID kTSA37NoradToAI7 = 174;
-static const ExtraID kTSA37PegasusAI7 = 175;
-static const ExtraID kTSA37AI7ToNorad = 176;
-static const ExtraID kTSA37NoradToDepart = 177;
-static const ExtraID kTSA37EnvironmentalScan = 178;
-static const ExtraID kTSA37DownloadToMainMenu = 179;
-static const ExtraID kTSA37DownloadToOpMemReview = 180;
-static const ExtraID kTSA37OpMemReviewToMainMenu = 181;
-static const ExtraID kTSA37OpMemReviewToAllClear = 182;
-static const ExtraID kTSA37AllClearToCongratulations = 183;
-static const ExtraID kTSA37Congratulations = 184;
-static const ExtraID kTSA37CongratulationsToExit = 185;
+enum {
+	kTSATransporterArrowLoop = 0,
+	kTSAArriveFromCaldoria = 1,
+	kTSAGTOtherChoice = 2,
+	kTSAGTCardSwipe = 3,
+	kTSAGTSelectCaldoria = 4,
+	kTSAGTGoToCaldoria = 5,
+	kTSAGTSelectBeach = 6,
+	kTSAGTGoToBeach = 7,
+	kTSAGTArriveAtBeach = 8,
+	kTSAGTSelectTokyo = 9,
+	kTSAGTGoToTokyo = 10,
+	kTSAGTArriveAtTokyo = 11,
+	kTSA02NorthZoomIn = 12,
+	kTSA02NorthTenSecondDoor = 13,
+	kTSA02NorthZoomOut = 14,
+	kTSA02NorthDoorWithAgent3 = 15,
+	kTSA03JimenezZoomIn = 16,
+	kTSA03JimenezSpeech = 17,
+	kTSA03JimenezZoomOut = 18,
+	kTSA03CrenshawZoomIn = 19,
+	kTSA03CrenshawSpeech = 20,
+	kTSA03CrenshawZoomOut = 21,
+	kTSA03SouthRobotDeath = 22,
+	kTSA04NorthRobotGreeting = 23,
+	kTSA04MatsumotoZoomIn = 24,
+	kTSA04MatsumotoSpeech = 25,
+	kTSA04MatsumotoZoomOut = 26,
+	kTSA04CastilleZoomIn = 27,
+	kTSA04CastilleSpeech = 28,
+	kTSA04CastilleZoomOut = 29,
+	kTSA05SinclairZoomIn = 30,
+	kTSA05SinclairSpeech = 31,
+	kTSA05SinclairZoomOut = 32,
+	kTSA05WhiteZoomIn = 33,
+	kTSA05WhiteSpeech = 34,
+	kTSA05WhiteZoomOut = 35,
+	kTSA0AEastRobot = 36,
+	kTSA0AWestRobot = 37,
+	kTSA16NorthRobotDeath = 38,
+	kTSA0BEastZoomIn = 39,
+	kTSA0BEastZoomedView = 40,
+	kTSA0BEastZoomOut = 41,
+	kTSA0BEastTurnLeft = 42,
+	kTSA0BComparisonStartup = 43,
+	kTSA0BComparisonView0000 = 44,
+	kTSA0BComparisonView0002 = 45,
+	kTSA0BComparisonView0020 = 46,
+	kTSA0BComparisonView0022 = 47,
+	kTSA0BComparisonView0200 = 48,
+	kTSA0BComparisonView0202 = 49,
+	kTSA0BComparisonView0220 = 50,
+	kTSA0BComparisonView0222 = 51,
+	kTSA0BComparisonView2000 = 52,
+	kTSA0BComparisonView2002 = 53,
+	kTSA0BComparisonView2020 = 54,
+	kTSA0BComparisonView2022 = 55,
+	kTSA0BComparisonView2200 = 56,
+	kTSA0BComparisonView2202 = 57,
+	kTSA0BComparisonView2220 = 58,
+	kTSA0BComparisonView2222 = 59,
+	kTSA0BNoradComparisonView = 60,
+	kTSA0BNoradUnaltered = 61,
+	kTSA0BNoradAltered = 62,
+	kTSA0BMarsComparisonView = 63,
+	kTSA0BMarsUnaltered = 64,
+	kTSA0BMarsAltered = 65,
+	kTSA0BWSCComparisonView = 66,
+	kTSA0BWSCUnaltered = 67,
+	kTSA0BWSCAltered = 68,
+	kTSA0BCaldoriaComparisonView = 69,
+	kTSA0BCaldoriaUnaltered = 70,
+	kTSA0BCaldoriaAltered = 71,
+	kTSA0BNorthZoomIn = 72,
+	kTSA0BNorthZoomedView = 73,
+	kTSA0BNorthZoomOut = 74,
+	kTSA0BNorthTurnLeft = 75,
+	kTSA0BNorthTurnRight = 76,
+	kTSA0BNorthHistLogOpen = 77,
+	kTSA0BNorthHistLogClose = 78,
+	kTSA0BNorthHistLogCloseWithLog = 79,
+	kTSA0BNorthCantChangeHistory = 80,
+	kTSA0BNorthYoureBusted = 81,
+	kTSA0BNorthFinallyHappened = 82,
+	kTSA0BShowRip1 = 83,
+	kTSA0BNorthRipView1 = 84,
+	kTSA0BShowRip2 = 85,
+	kTSA0BShowGuardRobots = 86,
+	kTSA0BAIInterruption = 87,
+	kTSA0BRobotsToCommandCenter = 88,
+	kTSA0BNorthRobotsAtCCView = 89,
+	kTSA0BNorthRobotsAtRRView = 90,
+	kTSA0BNorthRobotsAtFDView = 91,
+	kTSA0BRobotsFromCommandCenterToReadyRoom = 92,
+	kTSA0BRobotsFromReadyRoomToCommandCenter = 93,
+	kTSA0BRobotsFromCommandCenterToFrontDoor = 94,
+	kTSA0BRobotsFromFrontDoorToCommandCenter = 95,
+	kTSA0BRobotsFromFrontDoorToReadyRoom = 96,
+	kTSA0BRobotsFromReadyRoomToFrontDoor = 97,
+	kTSA0BWestZoomIn = 98,
+	kTSA0BWestZoomedView = 99,
+	kTSA0BWestZoomOut = 100,
+	kTSA0BWestTurnRight = 101,
+	kTSA0BTBPTheoryHighlight = 102,
+	kTSA0BTBPBackgroundHighlight = 103,
+	kTSA0BTBPProcedureHighlight = 104,
+	kTSA0BTBPTheory = 105,
+	kTSA0BTBPBackground = 106,
+	kTSA0BTBPProcedure = 107,
+	kTSA0BRipAlarmScreen = 108,
+	kTSA22RedEastZoomInSequence = 109,
+	kTSA22RedEastVaultViewWithKey = 110,
+	kTSA22RedEastVaultViewNoKey = 111,
+	kTSA23RedWestVaultZoomInSequence = 112,
+	kTSA23RedWestVaultViewWithChips = 113,
+	kTSA23RedWestVaultViewNoChips = 114,
+	kTSA25NorthDeniedNoKey = 115,
+	kTSA25NorthDeniedNoChip = 116,
+	kTSA25NorthPutOnSuit = 117,
+	kTSA25NorthAlreadyHaveSuit = 118,
+	kTSA25NorthDescending1 = 119,
+	kTSA25NorthDescending2 = 120,
+	kTSA37HorseToAI1 = 121,
+	kTSA37PegasusAI1 = 122,
+	kTSA37AI1ToCommissioner1 = 123,
+	kTSA37Commissioner1 = 124,
+	kTSA37Commissioner1ToZoom = 125,
+	kTSA37ZoomToPrehistoric = 126,
+	kTSA37PrehistoricToAI2 = 127,
+	kTSA37PegasusAI2 = 128,
+	kTSA37AI2ToPrehistoric = 129,
+	kTSA37PrehistoricToDepart = 130,
+	kTSA37PegasusDepart = 131,
+	kTSA37TimeJumpToPegasus = 132,
+	kTSA37RecallToDownload = 133,
+	kTSA37DownloadToColonel1 = 134,
+	kTSA37Colonel1 = 135,
+	kTSA37Colonel1ToReviewRequired = 136,
+	kTSA37ReviewRequiredToExit = 137,
+	kTSA37ExitHilited = 138,
+	kTSA37ExitToHorse = 139,
+	kTSA37HorseToColonel2 = 140,
+	kTSA37Colonel2 = 141,
+	kTSA37PegasusAI3 = 142,
+	kTSA37AI3ToHorse = 143,
+	kTSA37HorseToZoom = 144,
+	kTSA37ZoomToMainMenu = 145,
+	kTSA37MainMenuToAI4 = 146,
+	kTSA37PegasusAI4 = 147,
+	kTSA37AI4ToMainMenu = 148,
+	kTSA37JumpMenu000 = 149,
+	kTSA37JumpMenu001 = 150,
+	kTSA37JumpMenu010 = 151,
+	kTSA37JumpMenu011 = 152,
+	kTSA37JumpMenu100 = 153,
+	kTSA37JumpMenu101 = 154,
+	kTSA37JumpMenu110 = 155,
+	kTSA37JumpMenu111 = 156,
+	kTSA37JumpToWSCMenu = 157,
+	kTSA37CancelWSC = 158,
+	kTSA37JumpToWSC = 159,
+	kTSA37WSCToAI5 = 160,
+	kTSA37PegasusAI5 = 161,
+	kTSA37AI5ToWSC = 162,
+	kTSA37WSCToDepart = 163,
+	kTSA37JumpToMarsMenu = 164,
+	kTSA37CancelMars = 165,
+	kTSA37JumpToMars = 166,
+	kTSA37MarsToAI6 = 167,
+	kTSA37PegasusAI6 = 168,
+	kTSA37AI6ToMars = 169,
+	kTSA37MarsToDepart = 170,
+	kTSA37JumpToNoradMenu = 171,
+	kTSA37CancelNorad = 172,
+	kTSA37JumpToNorad = 173,
+	kTSA37NoradToAI7 = 174,
+	kTSA37PegasusAI7 = 175,
+	kTSA37AI7ToNorad = 176,
+	kTSA37NoradToDepart = 177,
+	kTSA37EnvironmentalScan = 178,
+	kTSA37DownloadToMainMenu = 179,
+	kTSA37DownloadToOpMemReview = 180,
+	kTSA37OpMemReviewToMainMenu = 181,
+	kTSA37OpMemReviewToAllClear = 182,
+	kTSA37AllClearToCongratulations = 183,
+	kTSA37Congratulations = 184,
+	kTSA37CongratulationsToExit = 185
+};
 
 const DisplayOrder kRipTimerOrder = kMonitorLayer;
 
+enum {
+	kUnresolvedLeft = kNavAreaLeft + 14,
+	kUnresolvedTop = kNavAreaTop + 236,
 
-const CoordType kUnresolvedLeft = kNavAreaLeft + 14;
-const CoordType kUnresolvedTop = kNavAreaTop + 236;
-
-const CoordType kResolvedLeft = kNavAreaLeft + 36;
-const CoordType kResolvedTop = kNavAreaTop + 236;
+	kResolvedLeft = kNavAreaLeft + 36,
+	kResolvedTop = kNavAreaTop + 236,
 
-const CoordType kJumpMenuLeft = kNavAreaLeft + 360;
-const CoordType kJumpMenuTop = kNavAreaTop + 202;
+	kJumpMenuLeft = kNavAreaLeft + 360,
+	kJumpMenuTop = kNavAreaTop + 202,
 
-const CoordType kJumpMenuHilitedLeft = kNavAreaLeft + 354;
-const CoordType kJumpMenuHilitedTop = kNavAreaTop + 196;
+	kJumpMenuHilitedLeft = kNavAreaLeft + 354,
+	kJumpMenuHilitedTop = kNavAreaTop + 196,
 
-const CoordType kExitLeft = kNavAreaLeft + 360;
-const CoordType kExitTop = kNavAreaTop + 216;
+	kExitLeft = kNavAreaLeft + 360,
+	kExitTop = kNavAreaTop + 216,
 
-const CoordType kExitHilitedLeft = kNavAreaLeft + 354;
-const CoordType kExitHilitedTop = kNavAreaTop + 210;
+	kExitHilitedLeft = kNavAreaLeft + 354,
+	kExitHilitedTop = kNavAreaTop + 210,
 
-const CoordType kRipTimerLeft = kNavAreaLeft + 95;
-const CoordType kRipTimerTop = kNavAreaTop + 87;
+	kRipTimerLeft = kNavAreaLeft + 95,
+	kRipTimerTop = kNavAreaTop + 87,
 
-const CoordType kTBPCloseLeft = kNavAreaLeft + 30;
-const CoordType kTBPCloseTop = kNavAreaTop + 16;
+	kTBPCloseLeft = kNavAreaLeft + 30,
+	kTBPCloseTop = kNavAreaTop + 16,
 
-const CoordType kTBPRewindLeft = kNavAreaLeft + 86;
-const CoordType kTBPRewindTop = kNavAreaTop + 218;
+	kTBPRewindLeft = kNavAreaLeft + 86,
+	kTBPRewindTop = kNavAreaTop + 218,
 
-const CoordType kComparisonCloseLeft = kNavAreaLeft + 50;
-const CoordType kComparisonCloseTop = kNavAreaTop + 14;
+	kComparisonCloseLeft = kNavAreaLeft + 50,
+	kComparisonCloseTop = kNavAreaTop + 14,
 
-const CoordType kComparisonLeftRewindLeft = kNavAreaLeft + 96;
-const CoordType kComparisonLeftRewindTop = kNavAreaTop + 190;
+	kComparisonLeftRewindLeft = kNavAreaLeft + 96,
+	kComparisonLeftRewindTop = kNavAreaTop + 190,
 
-const CoordType kComparisonRightRewindLeft = kNavAreaLeft + 282;
-const CoordType kComparisonRightRewindTop = kNavAreaTop + 190;
+	kComparisonRightRewindLeft = kNavAreaLeft + 282,
+	kComparisonRightRewindTop = kNavAreaTop + 190,
 
-const CoordType kComparisonHiliteSpriteLeft = kNavAreaLeft + 45;
-const CoordType kComparisonHiliteSpriteTop = kNavAreaTop + 65;
+	kComparisonHiliteSpriteLeft = kNavAreaLeft + 45,
+	kComparisonHiliteSpriteTop = kNavAreaTop + 65,
 
-const CoordType kComparisonHiliteNoradLeft = kNavAreaLeft + 45;
-const CoordType kComparisonHiliteNoradTop = kNavAreaTop + 65;
+	kComparisonHiliteNoradLeft = kNavAreaLeft + 45,
+	kComparisonHiliteNoradTop = kNavAreaTop + 65,
 
-const CoordType kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4;
-const CoordType kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23;
+	kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4,
+	kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23,
 
-const CoordType kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7;
-const CoordType kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46;
+	kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7,
+	kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46,
 
-const CoordType kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11;
-const CoordType kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68;
+	kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11,
+	kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68,
 
-const CoordType kComparisonChancesSpriteLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesSpriteTop = kNavAreaTop + 162;
+	kComparisonChancesSpriteLeft = kNavAreaLeft + 148,
+	kComparisonChancesSpriteTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesNoradLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesNoradTop = kNavAreaTop + 162;
+	kComparisonChancesNoradLeft = kNavAreaLeft + 148,
+	kComparisonChancesNoradTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesMarsLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesMarsTop = kNavAreaTop + 162;
+	kComparisonChancesMarsLeft = kNavAreaLeft + 148,
+	kComparisonChancesMarsTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1;
+	kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148,
+	kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1,
 
-const CoordType kComparisonChancesWSCLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesWSCTop = kNavAreaTop + 162;
+	kComparisonChancesWSCLeft = kNavAreaLeft + 148,
+	kComparisonChancesWSCTop = kNavAreaTop + 162,
 
-const CoordType kRedirectionSprite1Left = kNavAreaLeft + 58;
-const CoordType kRedirectionSprite1Top = kNavAreaTop + 16;
+	kRedirectionSprite1Left = kNavAreaLeft + 58,
+	kRedirectionSprite1Top = kNavAreaTop + 16,
 
-const CoordType kRedirectionSprite2Left = kNavAreaLeft + 36;
-const CoordType kRedirectionSprite2Top = kNavAreaTop + 166;
+	kRedirectionSprite2Left = kNavAreaLeft + 36,
+	kRedirectionSprite2Top = kNavAreaTop + 166,
 
-const CoordType kRedirectionCCRolloverLeft = kNavAreaLeft + 58;
-const CoordType kRedirectionCCRolloverTop = kNavAreaTop + 16;
+	kRedirectionCCRolloverLeft = kNavAreaLeft + 58,
+	kRedirectionCCRolloverTop = kNavAreaTop + 16,
 
-const CoordType kRedirectionRRRolloverLeft = kNavAreaLeft + 430;
-const CoordType kRedirectionRRRolloverTop = kNavAreaTop + 30;
+	kRedirectionRRRolloverLeft = kNavAreaLeft + 430,
+	kRedirectionRRRolloverTop = kNavAreaTop + 30,
 
-const CoordType kRedirectionFDRolloverLeft = kNavAreaLeft + 278;
-const CoordType kRedirectionFDRolloverTop = kNavAreaTop + 160;
+	kRedirectionFDRolloverLeft = kNavAreaLeft + 278,
+	kRedirectionFDRolloverTop = kNavAreaTop + 160,
 
-const CoordType kRedirectionCCDoorLeft = kNavAreaLeft + 174;
-const CoordType kRedirectionCCDoorTop = kNavAreaTop + 36;
+	kRedirectionCCDoorLeft = kNavAreaLeft + 174,
+	kRedirectionCCDoorTop = kNavAreaTop + 36,
 
-const CoordType kRedirectionRRDoorLeft = kNavAreaLeft + 418;
-const CoordType kRedirectionRRDoorTop = kNavAreaTop + 32;
+	kRedirectionRRDoorLeft = kNavAreaLeft + 418,
+	kRedirectionRRDoorTop = kNavAreaTop + 32,
 
-const CoordType kRedirectionFDDoorLeft = kNavAreaLeft + 298;
-const CoordType kRedirectionFDDoorTop = kNavAreaTop + 240;
+	kRedirectionFDDoorLeft = kNavAreaLeft + 298,
+	kRedirectionFDDoorTop = kNavAreaTop + 240,
 
-const CoordType kRedirectionSecuredLeft = kNavAreaLeft + 36;
-const CoordType kRedirectionSecuredTop = kNavAreaTop + 166;
+	kRedirectionSecuredLeft = kNavAreaLeft + 36,
+	kRedirectionSecuredTop = kNavAreaTop + 166,
 
-const CoordType kRedirectionNewTargetLeft = kNavAreaLeft + 36;
-const CoordType kRedirectionNewTargetTop = kNavAreaTop + 166;
+	kRedirectionNewTargetLeft = kNavAreaLeft + 36,
+	kRedirectionNewTargetTop = kNavAreaTop + 166,
 
-const CoordType kRedirectionCloseLeft = kNavAreaLeft + 56;
-const CoordType kRedirectionCloseTop = kNavAreaTop + 220;
+	kRedirectionCloseLeft = kNavAreaLeft + 56,
+	kRedirectionCloseTop = kNavAreaTop + 220
+};
 
 static const TimeValue kTSABumpIntoWallIn = 0;
 static const TimeValue kTSABumpIntoWallOut = 148;
@@ -516,10 +529,12 @@ static const TimeValue kTSAVaultCloseOut = 5388;
 static const TimeValue kTSAPegasusDoorCloseIn = 5388;
 static const TimeValue kTSAPegasusDoorCloseOut = 6457;
 
-static const bool kPegasusUnresolved = false;
-static const bool kPegasusResolved = true;
-static const bool kPegasusCantExit = false;
-static const bool kPegasusCanExit = true;
+enum {
+	kPegasusUnresolved = false,
+	kPegasusResolved = true,
+	kPegasusCantExit = false,
+	kPegasusCanExit = true
+};
 
 // Monitor modes
 enum {
@@ -582,15 +597,17 @@ static const ExtraID s_historicalLogViews[16] = {
 	kTSA0BComparisonView2222
 };
 
-static const int kRedirectionCCRolloverSprite = 0;
-static const int kRedirectionRRRolloverSprite = 1;
-static const int kRedirectionFDRolloverSprite = 2;
-static const int kRedirectionCCDoorSprite = 3;
-static const int kRedirectionRRDoorSprite = 4;
-static const int kRedirectionFDDoorSprite = 5;
-static const int kRedirectionCloseSprite = 6;
-static const int kRedirectionSecuredSprite = 0;
-static const int kRedirectionNewTargetSprite = 1;
+enum {
+	kRedirectionCCRolloverSprite = 0,
+	kRedirectionRRRolloverSprite = 1,
+	kRedirectionFDRolloverSprite = 2,
+	kRedirectionCCDoorSprite = 3,
+	kRedirectionRRDoorSprite = 4,
+	kRedirectionFDDoorSprite = 5,
+	kRedirectionCloseSprite = 6,
+	kRedirectionSecuredSprite = 0,
+	kRedirectionNewTargetSprite = 1
+};
 
 void RipTimer::initImage() {
 	_middle = -1;
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index c808325..0c29e06 100644
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -38,71 +38,81 @@ namespace Pegasus {
 
 static const int16 kCompassShift = 30;
 
-static const TimeScale kTinyTSAMovieScale = 600;
-static const TimeScale kTinyTSAFramesPerSecond = 15;
-static const TimeScale kTinyTSAFrameDuration = 40;
+enum {
+	kTinyTSAMovieScale = 600,
+	kTinyTSAFramesPerSecond = 15,
+	kTinyTSAFrameDuration = 40
+};
 
 // Alternate IDs.
-static const AlternateID kAltTinyTSANormal = 0;
+enum {
+	kAltTinyTSANormal = 0
+};
 
 // Hot Spot Activation IDs.
-static const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1;
-static const HotSpotActivationID kActivationTinyTSAJumpToMars = 2;
-static const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3;
-static const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4;
-static const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5;
+enum {
+	kActivationTinyTSAJumpToNorad = 1,
+	kActivationTinyTSAJumpToMars = 2,
+	kActivationTinyTSAJumpToWSC = 3,
+	kActivationTinyTSAReadyForJumpMenu = 4,
+	kActivationTinyTSAMainJumpMenu = 5
+};
 
 // Hot Spot IDs.
-static const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000;
-static const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001;
-static const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002;
-static const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003;
-static const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004;
-static const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005;
-static const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006;
-static const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007;
-static const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008;
-static const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009;
+enum {
+	kTinyTSA37NorthJumpToNoradSpotID = 5000,
+	kTinyTSA37NorthCancelNoradSpotID = 5001,
+	kTinyTSA37NorthJumpToMarsSpotID = 5002,
+	kTinyTSA37NorthCancelMarsSpotID = 5003,
+	kTinyTSA37NorthJumpToWSCSpotID = 5004,
+	kTinyTSA37NorthCancelWSCSpotID = 5005,
+	kTinyTSA37NorthJumpMenuSpotID = 5006,
+	kTinyTSA37NorthNoradMenuSpotID = 5007,
+	kTinyTSA37NorthMarsMenuSpotID = 5008,
+	kTinyTSA37NorthWSCMenuSpotID = 5009
+};
 
 // Extra sequence IDs.
-static const ExtraID kTinyTSA37PegasusDepart = 0;
-static const ExtraID kTinyTSA37TimeJumpToPegasus = 1;
-static const ExtraID kTinyTSA37RecallToDownload = 2;
-static const ExtraID kTinyTSA37ExitHilited = 3;
-static const ExtraID kTinyTSA37ExitToHorse = 4;
-static const ExtraID kTinyTSA37JumpMenu000 = 5;
-static const ExtraID kTinyTSA37JumpMenu001 = 6;
-static const ExtraID kTinyTSA37JumpMenu010 = 7;
-static const ExtraID kTinyTSA37JumpMenu011 = 8;
-static const ExtraID kTinyTSA37JumpMenu100 = 9;
-static const ExtraID kTinyTSA37JumpMenu101 = 10;
-static const ExtraID kTinyTSA37JumpMenu110 = 11;
-static const ExtraID kTinyTSA37JumpMenu111 = 12;
-static const ExtraID kTinyTSA37JumpToWSCMenu = 13;
-static const ExtraID kTinyTSA37CancelWSC = 14;
-static const ExtraID kTinyTSA37JumpToWSC = 15;
-static const ExtraID kTinyTSA37WSCToAI5 = 16;
-static const ExtraID kTinyTSA37PegasusAI5 = 17;
-static const ExtraID kTinyTSA37AI5ToWSC = 18;
-static const ExtraID kTinyTSA37WSCToDepart = 19;
-static const ExtraID kTinyTSA37JumpToMarsMenu = 20;
-static const ExtraID kTinyTSA37CancelMars = 21;
-static const ExtraID kTinyTSA37JumpToMars = 22;
-static const ExtraID kTinyTSA37MarsToAI6 = 23;
-static const ExtraID kTinyTSA37PegasusAI6 = 24;
-static const ExtraID kTinyTSA37AI6ToMars = 25;
-static const ExtraID kTinyTSA37MarsToDepart = 26;
-static const ExtraID kTinyTSA37JumpToNoradMenu = 27;
-static const ExtraID kTinyTSA37CancelNorad = 28;
-static const ExtraID kTinyTSA37JumpToNorad = 29;
-static const ExtraID kTinyTSA37NoradToAI7 = 30;
-static const ExtraID kTinyTSA37PegasusAI7 = 31;
-static const ExtraID kTinyTSA37AI7ToNorad = 32;
-static const ExtraID kTinyTSA37NoradToDepart = 33;
-static const ExtraID kTinyTSA37EnvironmentalScan = 34;
-static const ExtraID kTinyTSA37DownloadToMainMenu = 35;
-static const ExtraID kTinyTSA37DownloadToOpMemReview = 36;
-static const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37;
+enum {
+	kTinyTSA37PegasusDepart = 0,
+	kTinyTSA37TimeJumpToPegasus = 1,
+	kTinyTSA37RecallToDownload = 2,
+	kTinyTSA37ExitHilited = 3,
+	kTinyTSA37ExitToHorse = 4,
+	kTinyTSA37JumpMenu000 = 5,
+	kTinyTSA37JumpMenu001 = 6,
+	kTinyTSA37JumpMenu010 = 7,
+	kTinyTSA37JumpMenu011 = 8,
+	kTinyTSA37JumpMenu100 = 9,
+	kTinyTSA37JumpMenu101 = 10,
+	kTinyTSA37JumpMenu110 = 11,
+	kTinyTSA37JumpMenu111 = 12,
+	kTinyTSA37JumpToWSCMenu = 13,
+	kTinyTSA37CancelWSC = 14,
+	kTinyTSA37JumpToWSC = 15,
+	kTinyTSA37WSCToAI5 = 16,
+	kTinyTSA37PegasusAI5 = 17,
+	kTinyTSA37AI5ToWSC = 18,
+	kTinyTSA37WSCToDepart = 19,
+	kTinyTSA37JumpToMarsMenu = 20,
+	kTinyTSA37CancelMars = 21,
+	kTinyTSA37JumpToMars = 22,
+	kTinyTSA37MarsToAI6 = 23,
+	kTinyTSA37PegasusAI6 = 24,
+	kTinyTSA37AI6ToMars = 25,
+	kTinyTSA37MarsToDepart = 26,
+	kTinyTSA37JumpToNoradMenu = 27,
+	kTinyTSA37CancelNorad = 28,
+	kTinyTSA37JumpToNorad = 29,
+	kTinyTSA37NoradToAI7 = 30,
+	kTinyTSA37PegasusAI7 = 31,
+	kTinyTSA37AI7ToNorad = 32,
+	kTinyTSA37NoradToDepart = 33,
+	kTinyTSA37EnvironmentalScan = 34,
+	kTinyTSA37DownloadToMainMenu = 35,
+	kTinyTSA37DownloadToOpMemReview = 36,
+	kTinyTSA37OpMemReviewToMainMenu = 37
+};
 
 TinyTSA::TinyTSA(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "Tiny TSA", kTinyTSAID) {
 }
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index f009b35..5e35d8c 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -87,81 +87,85 @@ static const int kTimerEventPlasmaHit = 0;
 static const int kTimerEventPlayerGawkingAtRobot = 1;
 static const int kTimerEventPlayerGawkingAtRobot2 = 2;
 
-static const TimeValue kWSCMolecule1In = 0;
-static const TimeValue kWSCMolecule1Out = 937;
+enum {
+	kWSCMolecule1In = 0,
+	kWSCMolecule1Out = 937,
 
-static const TimeValue kWSCMolecule2In = 937;
-static const TimeValue kWSCMolecule2Out = 1864;
+	kWSCMolecule2In = 937,
+	kWSCMolecule2Out = 1864,
 
-static const TimeValue kWSCMolecule3In = 1864;
-static const TimeValue kWSCMolecule3Out = 2790;
+	kWSCMolecule3In = 1864,
+	kWSCMolecule3Out = 2790,
 
-static const TimeValue kWSCClick1In = 2790;
-static const TimeValue kWSCClick1Out = 2890;
+	kWSCClick1In = 2790,
+	kWSCClick1Out = 2890,
 
-static const TimeValue kWSCClick2In = 2890;
-static const TimeValue kWSCClick2Out = 3059;
+	kWSCClick2In = 2890,
+	kWSCClick2Out = 3059,
 
-static const TimeValue kWSCClick3In = 3059;
-static const TimeValue kWSCClick3Out = 3156;
+	kWSCClick3In = 3059,
+	kWSCClick3Out = 3156,
 
-static const TimeValue kWSCFlashlightClickIn = 3156;
-static const TimeValue kWSCFlashlightClickOut = 3211;
+	kWSCFlashlightClickIn = 3156,
+	kWSCFlashlightClickOut = 3211,
 
-static const TimeValue kWSCBumpIntoWallIn = 3211;
-static const TimeValue kWSCBumpIntoWallOut = 3514;
+	kWSCBumpIntoWallIn = 3211,
+	kWSCBumpIntoWallOut = 3514,
 
-static const TimeValue kWSCCantTransportIn = 3514;
-static const TimeValue kWSCCantTransportOut = 7791;
+	kWSCCantTransportIn = 3514,
+	kWSCCantTransportOut = 7791,
 
-static const TimeValue kHernandezNotHomeIn = 7791;
-static const TimeValue kHernandezNotHomeOut = 10199;
+	kHernandezNotHomeIn = 7791,
+	kHernandezNotHomeOut = 10199,
 
-static const TimeValue kWashingtonNotHomeIn = 10199;
-static const TimeValue kWashingtonNotHomeOut = 12649;
+	kWashingtonNotHomeIn = 10199,
+	kWashingtonNotHomeOut = 12649,
 
-static const TimeValue kSullivanNotHomeIn = 12649;
-static const TimeValue kSullivanNotHomeOut = 15031;
+	kSullivanNotHomeIn = 12649,
+	kSullivanNotHomeOut = 15031,
 
-static const TimeValue kNakamuraNotHomeIn = 15031;
-static const TimeValue kNakamuraNotHomeOut = 17545;
+	kNakamuraNotHomeIn = 15031,
+	kNakamuraNotHomeOut = 17545,
 
-static const TimeValue kGrailisNotHomeIn = 17545;
-static const TimeValue kGrailisNotHomeOut = 19937;
+	kGrailisNotHomeIn = 17545,
+	kGrailisNotHomeOut = 19937,
 
-static const TimeValue kTheriaultNotHomeIn = 19937;
-static const TimeValue kTheriaultNotHomeOut = 22395;
+	kTheriaultNotHomeIn = 19937,
+	kTheriaultNotHomeOut = 22395,
 
-static const TimeValue kGlennerNotHomeIn = 22395;
-static const TimeValue kGlennerNotHomeOut = 24770;
+	kGlennerNotHomeIn = 22395,
+	kGlennerNotHomeOut = 24770,
 
-static const TimeValue kSinclairNotHomeIn = 24770;
-static const TimeValue kSinclairNotHomeOut = 27328;
+	kSinclairNotHomeIn = 24770,
+	kSinclairNotHomeOut = 27328,
 
-static const TimeValue kWSCLabClosedIn = 27328;
-static const TimeValue kWSCLabClosedOut = 28904;
+	kWSCLabClosedIn = 27328,
+	kWSCLabClosedOut = 28904,
 
-static const TimeValue kSlidingDoorCloseIn = 28904;
-static const TimeValue kSlidingDoorCloseOut = 29295;
+	kSlidingDoorCloseIn = 28904,
+	kSlidingDoorCloseOut = 29295,
 
-static const TimeValue kSlimyDoorCloseIn = 29295;
-static const TimeValue kSlimyDoorCloseOut = 29788;
+	kSlimyDoorCloseIn = 29295,
+	kSlimyDoorCloseOut = 29788,
 
-static const TimeValue kPaging1In = 29788;
-static const TimeValue kPaging1Out = 32501;
+	kPaging1In = 29788,
+	kPaging1Out = 32501,
 
-static const TimeValue kPaging2In = 32501;
-static const TimeValue kPaging2Out = 34892;
+	kPaging2In = 32501,
+	kPaging2Out = 34892,
 
-static const TimeValue kCheckInIn = 34892;
-static const TimeValue kCheckInOut = 37789;
+	kCheckInIn = 34892,
+	kCheckInOut = 37789,
 
-static const TimeValue kDrinkAntidoteIn = 37789;
-static const TimeValue kDrinkAntidoteOut = 39725;
+	kDrinkAntidoteIn = 37789,
+	kDrinkAntidoteOut = 39725
+};
 
-static const TimeScale kWSCMovieScale = 600;
-static const TimeScale kWSCFramesPerSecond = 15;
-static const TimeScale kWSCFrameDuration = 40;
+enum {
+	kWSCMovieScale = 600,
+	kWSCFramesPerSecond = 15,
+	kWSCFrameDuration = 40
+};
 
 // Alternate IDs.
 static const AlternateID kAltWSCNormal = 0;
@@ -170,304 +174,312 @@ static const AlternateID kAltWSCW0ZDoorOpen = 2;
 static const AlternateID kAltWSCPeopleAtW19North = 3;
 
 // Room IDs.
-static const RoomID kWSC02 = 1;
-static const RoomID kWSC03 = 4;
-static const RoomID kWSC04 = 5;
-static const RoomID kWSC06 = 6;
-static const RoomID kWSC07 = 7;
-static const RoomID kWSC08 = 8;
-static const RoomID kWSC09 = 9;
-static const RoomID kWSC10 = 10;
-static const RoomID kWSC11 = 11;
-static const RoomID kWSC13 = 12;
-static const RoomID kWSC14 = 13;
-static const RoomID kWSC15 = 14;
-static const RoomID kWSC16 = 15;
-static const RoomID kWSC17 = 16;
-static const RoomID kWSC18 = 17;
-static const RoomID kWSC19 = 18;
-static const RoomID kWSC20 = 19;
-static const RoomID kWSC21 = 20;
-static const RoomID kWSC22 = 21;
-static const RoomID kWSC23 = 22;
-static const RoomID kWSC24 = 23;
-static const RoomID kWSC25 = 24;
-static const RoomID kWSC26 = 25;
-static const RoomID kWSC27 = 26;
-static const RoomID kWSC28 = 27;
-static const RoomID kWSC29 = 28;
-static const RoomID kWSC31 = 29;
-static const RoomID kWSC32 = 30;
-static const RoomID kWSC33 = 31;
-static const RoomID kWSC34 = 32;
-static const RoomID kWSC35 = 33;
-static const RoomID kWSC36 = 34;
-static const RoomID kWSC37 = 35;
-static const RoomID kWSC38 = 36;
-static const RoomID kWSC39 = 37;
-static const RoomID kWSC40 = 38;
-static const RoomID kWSC41 = 39;
-static const RoomID kWSC42 = 40;
-static const RoomID kWSC43 = 41;
-static const RoomID kWSC44 = 42;
-static const RoomID kWSC45 = 43;
-static const RoomID kWSC46 = 44;
-static const RoomID kWSC47 = 45;
-static const RoomID kWSC48 = 46;
-static const RoomID kWSC49 = 47;
-static const RoomID kWSC50 = 48;
-static const RoomID kWSC52 = 49;
-static const RoomID kWSC53 = 50;
-static const RoomID kWSC54 = 51;
-static const RoomID kWSC55 = 52;
-static const RoomID kWSC56 = 53;
-static const RoomID kWSC57 = 54;
-static const RoomID kWSC58 = 55;
-static const RoomID kWSC60 = 56;
-static const RoomID kWSC60East = 57;
-static const RoomID kWSC60North = 58;
-static const RoomID kWSC61 = 59;
-static const RoomID kWSC61South = 60;
-static const RoomID kWSC61West = 61;
-static const RoomID kWSC63 = 63;
-static const RoomID kWSC64 = 64;
-static const RoomID kWSC65 = 65;
-static const RoomID kWSC65Screen = 66;
-static const RoomID kWSC66 = 67;
-static const RoomID kWSC67 = 68;
-static const RoomID kWSC68 = 69;
-static const RoomID kWSC69 = 70;
-static const RoomID kWSC70 = 71;
-static const RoomID kWSC71 = 72;
-static const RoomID kWSC72 = 73;
-static const RoomID kWSC73 = 74;
-static const RoomID kWSC74 = 75;
-static const RoomID kWSC75 = 76;
-static const RoomID kWSC0Z = 77;
-static const RoomID kWSC76 = 78;
-static const RoomID kWSC77 = 79;
-static const RoomID kWSC78 = 80;
-static const RoomID kWSC79 = 81;
-static const RoomID kWSC80 = 82;
-static const RoomID kWSC81 = 83;
-static const RoomID kWSC82 = 84;
-static const RoomID kWSC83 = 85;
-static const RoomID kWSC84 = 86;
-static const RoomID kWSC85 = 87;
-static const RoomID kWSC86 = 88;
-static const RoomID kWSC87 = 89;
-static const RoomID kWSC88 = 90;
-static const RoomID kWSC89 = 91;
-static const RoomID kWSC90 = 92;
-static const RoomID kWSC91 = 93;
-static const RoomID kWSC92 = 94;
-static const RoomID kWSC93 = 95;
-static const RoomID kWSC94 = 96;
-static const RoomID kWSC95 = 97;
-static const RoomID kWSC96 = 98;
-static const RoomID kWSC97 = 99;
-static const RoomID kWSC98 = 100;
-static const RoomID kWSCDeathRoom = 101;
+enum {
+	kWSC02 = 1,
+	kWSC03 = 4,
+	kWSC04 = 5,
+	kWSC06 = 6,
+	kWSC07 = 7,
+	kWSC08 = 8,
+	kWSC09 = 9,
+	kWSC10 = 10,
+	kWSC11 = 11,
+	kWSC13 = 12,
+	kWSC14 = 13,
+	kWSC15 = 14,
+	kWSC16 = 15,
+	kWSC17 = 16,
+	kWSC18 = 17,
+	kWSC19 = 18,
+	kWSC20 = 19,
+	kWSC21 = 20,
+	kWSC22 = 21,
+	kWSC23 = 22,
+	kWSC24 = 23,
+	kWSC25 = 24,
+	kWSC26 = 25,
+	kWSC27 = 26,
+	kWSC28 = 27,
+	kWSC29 = 28,
+	kWSC31 = 29,
+	kWSC32 = 30,
+	kWSC33 = 31,
+	kWSC34 = 32,
+	kWSC35 = 33,
+	kWSC36 = 34,
+	kWSC37 = 35,
+	kWSC38 = 36,
+	kWSC39 = 37,
+	kWSC40 = 38,
+	kWSC41 = 39,
+	kWSC42 = 40,
+	kWSC43 = 41,
+	kWSC44 = 42,
+	kWSC45 = 43,
+	kWSC46 = 44,
+	kWSC47 = 45,
+	kWSC48 = 46,
+	kWSC49 = 47,
+	kWSC50 = 48,
+	kWSC52 = 49,
+	kWSC53 = 50,
+	kWSC54 = 51,
+	kWSC55 = 52,
+	kWSC56 = 53,
+	kWSC57 = 54,
+	kWSC58 = 55,
+	kWSC60 = 56,
+	kWSC60East = 57,
+	kWSC60North = 58,
+	kWSC61 = 59,
+	kWSC61South = 60,
+	kWSC61West = 61,
+	kWSC63 = 63,
+	kWSC64 = 64,
+	kWSC65 = 65,
+	kWSC65Screen = 66,
+	kWSC66 = 67,
+	kWSC67 = 68,
+	kWSC68 = 69,
+	kWSC69 = 70,
+	kWSC70 = 71,
+	kWSC71 = 72,
+	kWSC72 = 73,
+	kWSC73 = 74,
+	kWSC74 = 75,
+	kWSC75 = 76,
+	kWSC0Z = 77,
+	kWSC76 = 78,
+	kWSC77 = 79,
+	kWSC78 = 80,
+	kWSC79 = 81,
+	kWSC80 = 82,
+	kWSC81 = 83,
+	kWSC82 = 84,
+	kWSC83 = 85,
+	kWSC84 = 86,
+	kWSC85 = 87,
+	kWSC86 = 88,
+	kWSC87 = 89,
+	kWSC88 = 90,
+	kWSC89 = 91,
+	kWSC90 = 92,
+	kWSC91 = 93,
+	kWSC92 = 94,
+	kWSC93 = 95,
+	kWSC94 = 96,
+	kWSC95 = 97,
+	kWSC96 = 98,
+	kWSC97 = 99,
+	kWSC98 = 100,
+	kWSCDeathRoom = 101
+};
 
 // Hot Spot Activation IDs.
-static const HotSpotActivationID kActivationZoomedInToAnalyzer = 1;
-static const HotSpotActivationID kActivationShotByRobot = 2;
-static const HotSpotActivationID kActivationWarnedAboutPoison = 3;
-static const HotSpotActivationID kActivationMorphScreenOff = 4;
-static const HotSpotActivationID kActivationReadyForMorph = 5;
-static const HotSpotActivationID kActivationMorphLooping = 6;
-static const HotSpotActivationID kActivationMorphInterrupted = 7;
-static const HotSpotActivationID kActivationW03NorthOff = 8;
-static const HotSpotActivationID kActivationW03NorthReadyForInstructions = 9;
-static const HotSpotActivationID kActivationW03NorthSawInstructions = 10;
-static const HotSpotActivationID kActivationW03NorthInGame = 11;
-static const HotSpotActivationID kActivationReadyForSynthesis = 12;
-static const HotSpotActivationID kActivationSynthesizerLooping = 13;
-static const HotSpotActivationID kActivationReadyForMap = 14;
-static const HotSpotActivationID kActivationSinclairOfficeLocked = 15;
-static const HotSpotActivationID kActivationW58SouthDoorLocked = 16;
-static const HotSpotActivationID kActivationW61SouthOff = 17;
-static const HotSpotActivationID kActivationW61SouthOn = 18;
-static const HotSpotActivationID kActivationW61MessagesOff = 19;
-static const HotSpotActivationID kActivationW61MessagesOn = 20;
-static const HotSpotActivationID kActivationWSCRobotHeadOpen = 21;
-static const HotSpotActivationID kActivationRobotTurning = 22;
-static const HotSpotActivationID kActivationRobotDead = 23;
-static const HotSpotActivationID kActivationRobotGone = 24;
+enum {
+	kActivationZoomedInToAnalyzer = 1,
+	kActivationShotByRobot = 2,
+	kActivationWarnedAboutPoison = 3,
+	kActivationMorphScreenOff = 4,
+	kActivationReadyForMorph = 5,
+	kActivationMorphLooping = 6,
+	kActivationMorphInterrupted = 7,
+	kActivationW03NorthOff = 8,
+	kActivationW03NorthReadyForInstructions = 9,
+	kActivationW03NorthSawInstructions = 10,
+	kActivationW03NorthInGame = 11,
+	kActivationReadyForSynthesis = 12,
+	kActivationSynthesizerLooping = 13,
+	kActivationReadyForMap = 14,
+	kActivationSinclairOfficeLocked = 15,
+	kActivationW58SouthDoorLocked = 16,
+	kActivationW61SouthOff = 17,
+	kActivationW61SouthOn = 18,
+	kActivationW61MessagesOff = 19,
+	kActivationW61MessagesOn = 20,
+	kActivationWSCRobotHeadOpen = 21,
+	kActivationRobotTurning = 22,
+	kActivationRobotDead = 23,
+	kActivationRobotGone = 24
+};
 
 // Hot Spot IDs.
-static const HotSpotID kWSCDropDartSpotID = 5000;
-static const HotSpotID kWSCTurnOnAnalyzerSpotID = 5001;
-static const HotSpotID kWSCAnalyzerScreenSpotID = 5002;
-static const HotSpotID kWSCSpinRobotSpotID = 5003;
-static const HotSpotID kWSC01YesSpotID = 5004;
-static const HotSpotID kWSC01NoSpotID = 5005;
-static const HotSpotID kWSC01AcknowledgeWarningSpotID = 5006;
-static const HotSpotID kWSC02SouthMorphSpotID = 5007;
-static const HotSpotID kWSC02SouthMessagesSpotID = 5008;
-static const HotSpotID kWSC02SouthMorphOutSpotID = 5009;
-static const HotSpotID kWSC02ActivateMorphScreenSpotID = 5010;
-static const HotSpotID kWSC02SouthStartMorphSpotID = 5011;
-static const HotSpotID kWSC02SouthInterruptMorphSpotID = 5012;
-static const HotSpotID kWSC02SouthMorphFinishedSpotID = 5013;
-static const HotSpotID kWSC02SouthTakeArgonSpotID = 5014;
-static const HotSpotID kWSC02SouthMessagesOutSpotID = 5015;
-static const HotSpotID kWSC02SouthTakeNitrogenSpotID = 5016;
-static const HotSpotID kWSC02SouthPlayMessagesSpotID = 5017;
-static const HotSpotID kWSC03NorthActivateScreenSpotID = 5018;
-static const HotSpotID kWSC03NorthBuildMoleculeSpotID = 5019;
-static const HotSpotID kWSC03NorthProceedSpotID = 5020;
-static const HotSpotID kWSC03NorthMolecule1SpotID = 5021;
-static const HotSpotID kWSC03NorthMolecule2SpotID = 5022;
-static const HotSpotID kWSC03NorthMolecule3SpotID = 5023;
-static const HotSpotID kWSC03NorthMolecule4SpotID = 5024;
-static const HotSpotID kWSC03NorthMolecule5SpotID = 5025;
-static const HotSpotID kWSC03NorthMolecule6SpotID = 5026;
-static const HotSpotID kWSC03SouthActivateSynthesizerSpotID = 5027;
-static const HotSpotID kWSC03SouthPickUpAntidoteSpotID = 5028;
-static const HotSpotID kWSC07SouthMapSpotID = 5029;
-static const HotSpotID kW42EastUnlockDoorSpotID = 5030;
-static const HotSpotID kW56NorthMapSpotID = 5031;
-static const HotSpotID kW58SouthPryDoorSpotID = 5032;
-static const HotSpotID kWSC60EastSpotID = 5033;
-static const HotSpotID kWSC60NorthSpotID = 5034;
-static const HotSpotID kWSC60EastOutSpotID = 5035;
-static const HotSpotID kWSC60NorthOutSpotID = 5036;
-static const HotSpotID kWSC61EastSpotID = 5037;
-static const HotSpotID kWSC61SouthSpotID = 5038;
-static const HotSpotID kW61SouthMachineGunSpotID = 5039;
-static const HotSpotID kW61SouthDropMachineGunSpotID = 5040;
-static const HotSpotID kWSC61WestSpotID = 5041;
-static const HotSpotID kWSC61SouthOutSpotID = 5042;
-static const HotSpotID kW61SouthActivateSpotID = 5043;
-static const HotSpotID kW61SmartAlloysSpotID = 5044;
-static const HotSpotID kW61MorphingSpotID = 5045;
-static const HotSpotID kW61TimeBendingSpotID = 5046;
-static const HotSpotID kWSC61WestOutSpotID = 5047;
-static const HotSpotID kW61TurnOnMessagesSpotID = 5048;
-static const HotSpotID kW61WhiteMessageSpotID = 5049;
-static const HotSpotID kW61WalchekMessageSpotID = 5050;
-static const HotSpotID kWSC65SouthScreenSpotID = 5051;
-static const HotSpotID kWSC65SouthScreenOutSpotID = 5052;
-static const HotSpotID kW98RetinalChipSpotID = 5053;
-static const HotSpotID kW98MapChipSpotID = 5054;
-static const HotSpotID kW98OpticalChipSpotID = 5055;
-static const HotSpotID kW98DropArgonSpotID = 5056;
-static const HotSpotID kW98GrabCableSpotID = 5057;
-static const HotSpotID kW98OpenRobotSpotID = 5058;
-static const HotSpotID kW98StunGunSpotID = 5059;
+enum {
+	kWSCDropDartSpotID = 5000,
+	kWSCTurnOnAnalyzerSpotID = 5001,
+	kWSCAnalyzerScreenSpotID = 5002,
+	kWSCSpinRobotSpotID = 5003,
+	kWSC01YesSpotID = 5004,
+	kWSC01NoSpotID = 5005,
+	kWSC01AcknowledgeWarningSpotID = 5006,
+	kWSC02SouthMorphSpotID = 5007,
+	kWSC02SouthMessagesSpotID = 5008,
+	kWSC02SouthMorphOutSpotID = 5009,
+	kWSC02ActivateMorphScreenSpotID = 5010,
+	kWSC02SouthStartMorphSpotID = 5011,
+	kWSC02SouthInterruptMorphSpotID = 5012,
+	kWSC02SouthMorphFinishedSpotID = 5013,
+	kWSC02SouthTakeArgonSpotID = 5014,
+	kWSC02SouthMessagesOutSpotID = 5015,
+	kWSC02SouthTakeNitrogenSpotID = 5016,
+	kWSC02SouthPlayMessagesSpotID = 5017,
+	kWSC03NorthActivateScreenSpotID = 5018,
+	kWSC03NorthBuildMoleculeSpotID = 5019,
+	kWSC03NorthProceedSpotID = 5020,
+	kWSC03NorthMolecule1SpotID = 5021,
+	kWSC03NorthMolecule2SpotID = 5022,
+	kWSC03NorthMolecule3SpotID = 5023,
+	kWSC03NorthMolecule4SpotID = 5024,
+	kWSC03NorthMolecule5SpotID = 5025,
+	kWSC03NorthMolecule6SpotID = 5026,
+	kWSC03SouthActivateSynthesizerSpotID = 5027,
+	kWSC03SouthPickUpAntidoteSpotID = 5028,
+	kWSC07SouthMapSpotID = 5029,
+	kW42EastUnlockDoorSpotID = 5030,
+	kW56NorthMapSpotID = 5031,
+	kW58SouthPryDoorSpotID = 5032,
+	kWSC60EastSpotID = 5033,
+	kWSC60NorthSpotID = 5034,
+	kWSC60EastOutSpotID = 5035,
+	kWSC60NorthOutSpotID = 5036,
+	kWSC61EastSpotID = 5037,
+	kWSC61SouthSpotID = 5038,
+	kW61SouthMachineGunSpotID = 5039,
+	kW61SouthDropMachineGunSpotID = 5040,
+	kWSC61WestSpotID = 5041,
+	kWSC61SouthOutSpotID = 5042,
+	kW61SouthActivateSpotID = 5043,
+	kW61SmartAlloysSpotID = 5044,
+	kW61MorphingSpotID = 5045,
+	kW61TimeBendingSpotID = 5046,
+	kWSC61WestOutSpotID = 5047,
+	kW61TurnOnMessagesSpotID = 5048,
+	kW61WhiteMessageSpotID = 5049,
+	kW61WalchekMessageSpotID = 5050,
+	kWSC65SouthScreenSpotID = 5051,
+	kWSC65SouthScreenOutSpotID = 5052,
+	kW98RetinalChipSpotID = 5053,
+	kW98MapChipSpotID = 5054,
+	kW98OpticalChipSpotID = 5055,
+	kW98DropArgonSpotID = 5056,
+	kW98GrabCableSpotID = 5057,
+	kW98OpenRobotSpotID = 5058,
+	kW98StunGunSpotID = 5059
+};
 
 // Extra sequence IDs.
-static const ExtraID kWSCArrivalFromTSA = 0;
-static const ExtraID kWSCShotByRobot = 1;
-static const ExtraID kWSCDartScan1 = 2;
-static const ExtraID kWSCDartScan2 = 3;
-static const ExtraID kWSCDartScanNo = 4;
-static const ExtraID kWSCDartScan3 = 5;
-static const ExtraID kWSCAnalyzerPowerUp = 6;
-static const ExtraID kWSCAnalyzerPowerUpWithDart = 7;
-static const ExtraID kWSCDropDartIntoAnalyzer = 8;
-static const ExtraID kWSCAnalyzeDart = 9;
-static const ExtraID kWSCZoomOutFromAnalyzer = 10;
-static const ExtraID kWSCSpinRobot = 11;
-static const ExtraID kWSC02MorphZoomNoArgon = 12;
-static const ExtraID kWSC02MessagesZoomNoNitrogen = 13;
-static const ExtraID kWSC02ZoomOutNoArgon = 14;
-static const ExtraID kWSC02TurnOnMorphScreen = 15;
-static const ExtraID kWSC02DropToMorphExperiment = 16;
-static const ExtraID kWSC02MorphLoop = 17;
-static const ExtraID kWSC02MorphInterruption = 18;
-static const ExtraID kWSC02MorphFinished = 19;
-static const ExtraID kWSC02TurnOffMorphScreen = 20;
-static const ExtraID kWSC02SouthViewNoArgon = 21;
-static const ExtraID kMessagesMovedToOffice = 22;
-static const ExtraID kMessagesOff = 23;
-static const ExtraID kMessagesZoomOutNoNitrogen = 24;
-static const ExtraID kMessagesMovedToOfficeNoNitrogen = 25;
-static const ExtraID kMessagesOffNoNitrogen = 26;
-static const ExtraID kMessagesViewNoNitrogen = 27;
-static const ExtraID kMessagesViewMachineOnNoNitrogen = 28;
-static const ExtraID kW03NorthActivate = 29;
-static const ExtraID kW03NorthGetData = 30;
-static const ExtraID kW03NorthInstructions = 31;
-static const ExtraID kW03NorthPrepMolecule1 = 32;
-static const ExtraID kW03NorthPrepMolecule2 = 33;
-static const ExtraID kW03NorthPrepMolecule3 = 34;
-static const ExtraID kW03NorthFinishSynthesis = 35;
-static const ExtraID kW03SouthCreateAntidote = 36;
-static const ExtraID kW03SouthAntidoteLoop = 37;
-static const ExtraID kW03SouthDeactivate = 38;
-static const ExtraID kW03SouthViewNoAntidote = 39;
-static const ExtraID kWSC07SouthMap = 40;
-static const ExtraID kW17WestPeopleCrossing = 41;
-static const ExtraID kW17WestPeopleCrossingView = 42;
-static const ExtraID kW21SouthPeopleCrossing = 43;
-static const ExtraID kW24SouthPeopleCrossing = 44;
-static const ExtraID kW34EastPeopleCrossing = 45;
-static const ExtraID kW36WestPeopleCrossing = 46;
-static const ExtraID kW38NorthPeopleCrossing = 47;
-static const ExtraID kW46SouthPeopleCrossing = 48;
-static const ExtraID kW49NorthPeopleCrossing = 49;
-static const ExtraID kW49NorthPeopleCrossingView = 50;
-static const ExtraID kWSC56SouthMap = 51;
-static const ExtraID kNerdAtTheDoor1 = 52;
-static const ExtraID kNerdAtTheDoor2 = 53;
-static const ExtraID kW61SouthZoomInNoGun = 54;
-static const ExtraID kW61Brochure = 55;
-static const ExtraID kW61SouthScreenOnWithGun = 56;
-static const ExtraID kW61SouthScreenOffWithGun = 57;
-static const ExtraID kW61SouthSmartAlloysWithGun = 58;
-static const ExtraID kW61SouthMorphingWithGun = 59;
-static const ExtraID kW61SouthTimeBendingWithGun = 60;
-static const ExtraID kW61SouthZoomOutNoGun = 61;
-static const ExtraID kW61SouthScreenOnNoGun = 62;
-static const ExtraID kW61SouthScreenOffNoGun = 63;
-static const ExtraID kW61SouthSmartAlloysNoGun = 64;
-static const ExtraID kW61SouthMorphingNoGun = 65;
-static const ExtraID kW61SouthTimeBendingNoGun = 66;
-static const ExtraID kW61MessagesOn = 67;
-static const ExtraID kW61MessagesOff = 68;
-static const ExtraID kW61WhiteMessage = 69;
-static const ExtraID kW61WalchekMessage = 70;
-static const ExtraID kW61WalchekEasterEgg1 = 71;
-static const ExtraID kW62SouthPlasmaRobotAppears = 72;
-static const ExtraID kW62ZoomToRobot = 73;
-static const ExtraID kW62ZoomOutFromRobot = 74;
-static const ExtraID kW62PlasmaDodgeSurvive = 75;
-static const ExtraID kW62PlasmaDodgeDie = 76;
-static const ExtraID kW65SouthSinclairLecture = 77;
-static const ExtraID kW73WestPeopleCrossing = 78;
-static const ExtraID kW73WestPeopleCrossingView = 79;
-static const ExtraID kW0ZSpottedByWomen = 80;
-static const ExtraID kW95RobotShoots = 81;
-static const ExtraID kW98MorphsToRobot = 82;
-static const ExtraID kW98RobotShoots = 83;
-static const ExtraID kW98RobotShocked = 84;
-static const ExtraID kW98RobotGassed = 85;
-static const ExtraID kW98RobotHeadOpensDark = 86;
-static const ExtraID kW98RobotHead000Dark = 87;
-static const ExtraID kW98RobotHead001Dark = 88;
-static const ExtraID kW98RobotHead010Dark = 89;
-static const ExtraID kW98RobotHead011Dark = 90;
-static const ExtraID kW98RobotHead100Dark = 91;
-static const ExtraID kW98RobotHead101Dark = 92;
-static const ExtraID kW98RobotHead110Dark = 93;
-static const ExtraID kW98RobotHead111Dark = 94;
-static const ExtraID kW98RobotHeadClosesDark = 95;
-static const ExtraID kW98WestViewWithGunDark = 96;
-static const ExtraID kW98WestViewNoGunDark = 97;
-static const ExtraID kW98RobotHeadOpensLight = 98;
-static const ExtraID kW98RobotHead000Light = 99;
-static const ExtraID kW98RobotHead001Light = 100;
-static const ExtraID kW98RobotHead010Light = 101;
-static const ExtraID kW98RobotHead011Light = 102;
-static const ExtraID kW98RobotHead100Light = 103;
-static const ExtraID kW98RobotHead101Light = 104;
-static const ExtraID kW98RobotHead110Light = 105;
-static const ExtraID kW98RobotHead111Light = 106;
-static const ExtraID kW98RobotHeadClosesLight = 107;
-static const ExtraID kW98WestViewWithGunLight = 108;
-static const ExtraID kW98WestViewNoGunLight = 109;
+enum {
+	kWSCArrivalFromTSA = 0,
+	kWSCShotByRobot = 1,
+	kWSCDartScan1 = 2,
+	kWSCDartScan2 = 3,
+	kWSCDartScanNo = 4,
+	kWSCDartScan3 = 5,
+	kWSCAnalyzerPowerUp = 6,
+	kWSCAnalyzerPowerUpWithDart = 7,
+	kWSCDropDartIntoAnalyzer = 8,
+	kWSCAnalyzeDart = 9,
+	kWSCZoomOutFromAnalyzer = 10,
+	kWSCSpinRobot = 11,
+	kWSC02MorphZoomNoArgon = 12,
+	kWSC02MessagesZoomNoNitrogen = 13,
+	kWSC02ZoomOutNoArgon = 14,
+	kWSC02TurnOnMorphScreen = 15,
+	kWSC02DropToMorphExperiment = 16,
+	kWSC02MorphLoop = 17,
+	kWSC02MorphInterruption = 18,
+	kWSC02MorphFinished = 19,
+	kWSC02TurnOffMorphScreen = 20,
+	kWSC02SouthViewNoArgon = 21,
+	kMessagesMovedToOffice = 22,
+	kMessagesOff = 23,
+	kMessagesZoomOutNoNitrogen = 24,
+	kMessagesMovedToOfficeNoNitrogen = 25,
+	kMessagesOffNoNitrogen = 26,
+	kMessagesViewNoNitrogen = 27,
+	kMessagesViewMachineOnNoNitrogen = 28,
+	kW03NorthActivate = 29,
+	kW03NorthGetData = 30,
+	kW03NorthInstructions = 31,
+	kW03NorthPrepMolecule1 = 32,
+	kW03NorthPrepMolecule2 = 33,
+	kW03NorthPrepMolecule3 = 34,
+	kW03NorthFinishSynthesis = 35,
+	kW03SouthCreateAntidote = 36,
+	kW03SouthAntidoteLoop = 37,
+	kW03SouthDeactivate = 38,
+	kW03SouthViewNoAntidote = 39,
+	kWSC07SouthMap = 40,
+	kW17WestPeopleCrossing = 41,
+	kW17WestPeopleCrossingView = 42,
+	kW21SouthPeopleCrossing = 43,
+	kW24SouthPeopleCrossing = 44,
+	kW34EastPeopleCrossing = 45,
+	kW36WestPeopleCrossing = 46,
+	kW38NorthPeopleCrossing = 47,
+	kW46SouthPeopleCrossing = 48,
+	kW49NorthPeopleCrossing = 49,
+	kW49NorthPeopleCrossingView = 50,
+	kWSC56SouthMap = 51,
+	kNerdAtTheDoor1 = 52,
+	kNerdAtTheDoor2 = 53,
+	kW61SouthZoomInNoGun = 54,
+	kW61Brochure = 55,
+	kW61SouthScreenOnWithGun = 56,
+	kW61SouthScreenOffWithGun = 57,
+	kW61SouthSmartAlloysWithGun = 58,
+	kW61SouthMorphingWithGun = 59,
+	kW61SouthTimeBendingWithGun = 60,
+	kW61SouthZoomOutNoGun = 61,
+	kW61SouthScreenOnNoGun = 62,
+	kW61SouthScreenOffNoGun = 63,
+	kW61SouthSmartAlloysNoGun = 64,
+	kW61SouthMorphingNoGun = 65,
+	kW61SouthTimeBendingNoGun = 66,
+	kW61MessagesOn = 67,
+	kW61MessagesOff = 68,
+	kW61WhiteMessage = 69,
+	kW61WalchekMessage = 70,
+	kW61WalchekEasterEgg1 = 71,
+	kW62SouthPlasmaRobotAppears = 72,
+	kW62ZoomToRobot = 73,
+	kW62ZoomOutFromRobot = 74,
+	kW62PlasmaDodgeSurvive = 75,
+	kW62PlasmaDodgeDie = 76,
+	kW65SouthSinclairLecture = 77,
+	kW73WestPeopleCrossing = 78,
+	kW73WestPeopleCrossingView = 79,
+	kW0ZSpottedByWomen = 80,
+	kW95RobotShoots = 81,
+	kW98MorphsToRobot = 82,
+	kW98RobotShoots = 83,
+	kW98RobotShocked = 84,
+	kW98RobotGassed = 85,
+	kW98RobotHeadOpensDark = 86,
+	kW98RobotHead000Dark = 87,
+	kW98RobotHead001Dark = 88,
+	kW98RobotHead010Dark = 89,
+	kW98RobotHead011Dark = 90,
+	kW98RobotHead100Dark = 91,
+	kW98RobotHead101Dark = 92,
+	kW98RobotHead110Dark = 93,
+	kW98RobotHead111Dark = 94,
+	kW98RobotHeadClosesDark = 95,
+	kW98WestViewWithGunDark = 96,
+	kW98WestViewNoGunDark = 97,
+	kW98RobotHeadOpensLight = 98,
+	kW98RobotHead000Light = 99,
+	kW98RobotHead001Light = 100,
+	kW98RobotHead010Light = 101,
+	kW98RobotHead011Light = 102,
+	kW98RobotHead100Light = 103,
+	kW98RobotHead101Light = 104,
+	kW98RobotHead110Light = 105,
+	kW98RobotHead111Light = 106,
+	kW98RobotHeadClosesLight = 107,
+	kW98WestViewWithGunLight = 108,
+	kW98WestViewNoGunLight = 109
+};
 
 static const CoordType kMoleculesMovieLeft = kNavAreaLeft + 112;
 static const CoordType kMoleculesMovieTop = kNavAreaTop + 40;






More information about the Scummvm-git-logs mailing list