PEGASUS: Cleanup some constants

Added missing static qualifiers, get rid of some short/long

1 files changed, 58 insertions, 58 deletions

diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index 823aa17d6c..2fa6c5377a 100755
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -36,73 +36,73 @@
 
 namespace Pegasus {
 
-const short kCompassShift = 30;
+static const int16 kCompassShift = 30;
 
-const TimeScale kTinyTSAMovieScale = 600;
-const TimeScale kTinyTSAFramesPerSecond = 15;
-const TimeScale kTinyTSAFrameDuration = 40;
+static const TimeScale kTinyTSAMovieScale = 600;
+static const TimeScale kTinyTSAFramesPerSecond = 15;
+static const TimeScale kTinyTSAFrameDuration = 40;
 
 // Alternate IDs.
-const AlternateID kAltTinyTSANormal = 0;
+static const AlternateID kAltTinyTSANormal = 0;
 
 // Hot Spot Activation IDs.
-const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1;
-const HotSpotActivationID kActivationTinyTSAJumpToMars = 2;
-const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3;
-const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4;
-const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5;
+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;
 
 // Hot Spot IDs.
-const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000;
-const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001;
-const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002;
-const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003;
-const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004;
-const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005;
-const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006;
-const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007;
-const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008;
-const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009;
+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;
 
 // Extra sequence IDs.
-const ExtraID kTinyTSA37PegasusDepart = 0;
-const ExtraID kTinyTSA37TimeJumpToPegasus = 1;
-const ExtraID kTinyTSA37RecallToDownload = 2;
-const ExtraID kTinyTSA37ExitHilited = 3;
-const ExtraID kTinyTSA37ExitToHorse = 4;
-const ExtraID kTinyTSA37JumpMenu000 = 5;
-const ExtraID kTinyTSA37JumpMenu001 = 6;
-const ExtraID kTinyTSA37JumpMenu010 = 7;
-const ExtraID kTinyTSA37JumpMenu011 = 8;
-const ExtraID kTinyTSA37JumpMenu100 = 9;
-const ExtraID kTinyTSA37JumpMenu101 = 10;
-const ExtraID kTinyTSA37JumpMenu110 = 11;
-const ExtraID kTinyTSA37JumpMenu111 = 12;
-const ExtraID kTinyTSA37JumpToWSCMenu = 13;
-const ExtraID kTinyTSA37CancelWSC = 14;
-const ExtraID kTinyTSA37JumpToWSC = 15;
-const ExtraID kTinyTSA37WSCToAI5 = 16;
-const ExtraID kTinyTSA37PegasusAI5 = 17;
-const ExtraID kTinyTSA37AI5ToWSC = 18;
-const ExtraID kTinyTSA37WSCToDepart = 19;
-const ExtraID kTinyTSA37JumpToMarsMenu = 20;
-const ExtraID kTinyTSA37CancelMars = 21;
-const ExtraID kTinyTSA37JumpToMars = 22;
-const ExtraID kTinyTSA37MarsToAI6 = 23;
-const ExtraID kTinyTSA37PegasusAI6 = 24;
-const ExtraID kTinyTSA37AI6ToMars = 25;
-const ExtraID kTinyTSA37MarsToDepart = 26;
-const ExtraID kTinyTSA37JumpToNoradMenu = 27;
-const ExtraID kTinyTSA37CancelNorad = 28;
-const ExtraID kTinyTSA37JumpToNorad = 29;
-const ExtraID kTinyTSA37NoradToAI7 = 30;
-const ExtraID kTinyTSA37PegasusAI7 = 31;
-const ExtraID kTinyTSA37AI7ToNorad = 32;
-const ExtraID kTinyTSA37NoradToDepart = 33;
-const ExtraID kTinyTSA37EnvironmentalScan = 34;
-const ExtraID kTinyTSA37DownloadToMainMenu = 35;
-const ExtraID kTinyTSA37DownloadToOpMemReview = 36;
-const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37;
+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;
 
 TinyTSA::TinyTSA(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "Tiny TSA", kTinyTSAID) {
 }