PEGASUS: Cleanup some constants

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

1 files changed, 167 insertions, 167 deletions

diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h
index 6d743c3408..b50f8503ef 100755
--- a/engines/pegasus/items/item.h
+++ b/engines/pegasus/items/item.h
@@ -68,9 +68,9 @@ struct ItemStateInfo {
 
 //	ItemExtraEntry
 
-const short kLeftAreaExtra = 0;
-const short kMiddleAreaExtra = 1;
-const short kRightAreaExtra = 2;
+static const short kLeftAreaExtra = 0;
+static const short kMiddleAreaExtra = 1;
+static const short kRightAreaExtra = 2;
 
 struct ItemExtraEntry {
 	uint32 extraID;
@@ -90,184 +90,184 @@ struct ItemExtraInfo {
 //	Individual inventory items are stored in these resource types.
 //	Resource ID is item ID + kItemBaseResID.
 
-const uint32 kItemInfoResType = MKTAG('I', 't', 'e', 'm');       // JMPItemInfoHandle
-const uint32 kLeftAreaInfoResType = MKTAG('L', 'e', 'f', 't');   // ItemStateInfoHandle
-const uint32 kMiddleAreaInfoResType = MKTAG('M', 'i', 'd', 'l'); // ItemStateInfoHandle
-const uint32 kRightAreaInfoResType = MKTAG('R', 'g', 'h', 't');  // ItemStateInfoHandle
-const uint32 kItemExtraInfoResType = MKTAG('I', 'X', 't', 'r');	 // ItemExtraInfoHandle
+static const uint32 kItemInfoResType = MKTAG('I', 't', 'e', 'm');       // JMPItemInfoHandle
+static const uint32 kLeftAreaInfoResType = MKTAG('L', 'e', 'f', 't');   // ItemStateInfoHandle
+static const uint32 kMiddleAreaInfoResType = MKTAG('M', 'i', 'd', 'l'); // ItemStateInfoHandle
+static const uint32 kRightAreaInfoResType = MKTAG('R', 'g', 'h', 't');  // ItemStateInfoHandle
+static const uint32 kItemExtraInfoResType = MKTAG('I', 'X', 't', 'r');	 // ItemExtraInfoHandle
 
-const uint16 kItemBaseResID = 128;
+static const uint16 kItemBaseResID = 128;
 
 //	Item IDs.
 
-const ItemID kAirMask = 7;
-const ItemID kAntidote = 8;
-const ItemID kArgonCanister = 9;
-const ItemID kCardBomb = 10;
-const ItemID kCrowbar = 11;
-const ItemID kGasCanister = 12;
-const ItemID kHistoricalLog = 13;
-const ItemID kJourneymanKey = 14;
-const ItemID kKeyCard = 15;
-const ItemID kMachineGun = 16;
-const ItemID kMarsCard = 17;
-const ItemID kNitrogenCanister = 18;
-const ItemID kOrangeJuiceGlassFull = 19;
-const ItemID kOrangeJuiceGlassEmpty = 20;
-const ItemID kPoisonDart = 21;
-const ItemID kSinclairKey = 22;
-const ItemID kStunGun = 23;
-const ItemID kArgonPickup = 24;
+static const ItemID kAirMask = 7;
+static const ItemID kAntidote = 8;
+static const ItemID kArgonCanister = 9;
+static const ItemID kCardBomb = 10;
+static const ItemID kCrowbar = 11;
+static const ItemID kGasCanister = 12;
+static const ItemID kHistoricalLog = 13;
+static const ItemID kJourneymanKey = 14;
+static const ItemID kKeyCard = 15;
+static const ItemID kMachineGun = 16;
+static const ItemID kMarsCard = 17;
+static const ItemID kNitrogenCanister = 18;
+static const ItemID kOrangeJuiceGlassFull = 19;
+static const ItemID kOrangeJuiceGlassEmpty = 20;
+static const ItemID kPoisonDart = 21;
+static const ItemID kSinclairKey = 22;
+static const ItemID kStunGun = 23;
+static const ItemID kArgonPickup = 24;
 
 //	Biochips.
 
-const ItemID kAIBiochip = 0;
-const ItemID kInterfaceBiochip = 1;
-const ItemID kMapBiochip = 2;
-const ItemID kOpticalBiochip = 3;
-const ItemID kPegasusBiochip = 4;
-const ItemID kRetinalScanBiochip = 5;
-const ItemID kShieldBiochip = 6;
+static const ItemID kAIBiochip = 0;
+static const ItemID kInterfaceBiochip = 1;
+static const ItemID kMapBiochip = 2;
+static const ItemID kOpticalBiochip = 3;
+static const ItemID kPegasusBiochip = 4;
+static const ItemID kRetinalScanBiochip = 5;
+static const ItemID kShieldBiochip = 6;
 
-const ItemID kNumItems = 25;
+static const ItemID kNumItems = 25;
 
 //	Item States.
 
-const ItemState kAI000 = 0;
-const ItemState kAI005 = 1;
-const ItemState kAI006 = 2;
-const ItemState kAI010 = 3;
-const ItemState kAI015 = 4;
-const ItemState kAI016 = 5;
-const ItemState kAI020 = 6;
-const ItemState kAI024 = 7;
-const ItemState kAI100 = 8;
-const ItemState kAI101 = 9;
-const ItemState kAI105 = 10;
-const ItemState kAI106 = 11;
-const ItemState kAI110 = 12;
-const ItemState kAI111 = 13;
-const ItemState kAI115 = 14;
-const ItemState kAI116 = 15;
-const ItemState kAI120 = 16;
-const ItemState kAI121 = 17;
-const ItemState kAI124 = 18;
-const ItemState kAI125 = 19;
-const ItemState kAI126 = 20;
-const ItemState kAI200 = 21;
-const ItemState kAI201 = 22;
-const ItemState kAI202 = 23;
-const ItemState kAI205 = 24;
-const ItemState kAI206 = 25;
-const ItemState kAI210 = 26;
-const ItemState kAI211 = 27;
-const ItemState kAI212 = 28;
-const ItemState kAI215 = 29;
-const ItemState kAI216 = 30;
-const ItemState kAI220 = 31;
-const ItemState kAI221 = 32;
-const ItemState kAI222 = 33;
-const ItemState kAI224 = 34;
-const ItemState kAI225 = 35;
-const ItemState kAI226 = 36;
-const ItemState kAI300 = 37;
-const ItemState kAI301 = 38;
-const ItemState kAI302 = 39;
-const ItemState kAI303 = 40;
-const ItemState kAI305 = 41;
-const ItemState kAI306 = 42;
-const ItemState kAI310 = 43;
-const ItemState kAI311 = 44;
-const ItemState kAI312 = 45;
-const ItemState kAI313 = 46;
-const ItemState kAI315 = 47;
-const ItemState kAI316 = 48;
-const ItemState kAI320 = 49;
-const ItemState kAI321 = 50;
-const ItemState kAI322 = 51;
-const ItemState kAI323 = 52;
-const ItemState kAI324 = 53;
-const ItemState kAI325 = 54;
-const ItemState kAI326 = 55;
-const ItemState kNormalItem = 56;
-const ItemState kMapUnavailable = 57;
-const ItemState kMapEngaged = 58;
-const ItemState kOptical000 = 59;
-const ItemState kOptical001 = 60;
-const ItemState kOptical002 = 61;
-const ItemState kOptical010 = 62;
-const ItemState kOptical011 = 63;
-const ItemState kOptical012 = 64;
-const ItemState kOptical020 = 65;
-const ItemState kOptical021 = 66;
-const ItemState kOptical100 = 67;
-const ItemState kOptical101 = 68;
-const ItemState kOptical102 = 69;
-const ItemState kOptical110 = 70;
-const ItemState kOptical111 = 71;
-const ItemState kOptical112 = 72;
-const ItemState kOptical120 = 73;
-const ItemState kOptical121 = 74;
-const ItemState kOptical200 = 75;
-const ItemState kOptical201 = 76;
-const ItemState kOptical210 = 77;
-const ItemState kOptical211 = 78;
-const ItemState kPegasusTSA00 = 79;
-const ItemState kPegasusTSA10 = 80;
-const ItemState kPegasusPrehistoric00 = 81;
-const ItemState kPegasusPrehistoric01 = 82;
-const ItemState kPegasusPrehistoric10 = 83;
-const ItemState kPegasusPrehistoric11 = 84;
-const ItemState kPegasusMars00 = 85;
-const ItemState kPegasusMars01 = 86;
-const ItemState kPegasusMars10 = 87;
-const ItemState kPegasusMars11 = 88;
-const ItemState kPegasusNorad00 = 89;
-const ItemState kPegasusNorad01 = 90;
-const ItemState kPegasusNorad10 = 91;
-const ItemState kPegasusNorad11 = 92;
-const ItemState kPegasusWSC00 = 93;
-const ItemState kPegasusWSC01 = 94;
-const ItemState kPegasusWSC10 = 95;
-const ItemState kPegasusWSC11 = 96;
-const ItemState kPegasusCaldoria = 97;
-const ItemState kRetinalSimulating = 98;
-const ItemState kShieldNormal = 99;
-const ItemState kShieldRadiation = 100;
-const ItemState kShieldPlasma = 101;
-const ItemState kShieldCardBomb = 102;
-const ItemState kShieldDraining = 103;
-const ItemState kAirMaskEmptyOff = 104;
-const ItemState kAirMaskEmptyFilter = 105;
-const ItemState kAirMaskLowOff = 106;
-const ItemState kAirMaskLowFilter = 107;
-const ItemState kAirMaskLowOn = 108;
-const ItemState kAirMaskFullOff = 109;
-const ItemState kAirMaskFullFilter = 110;
-const ItemState kAirMaskFullOn = 111;
-const ItemState kArgonEmpty = 112;
-const ItemState kArgonFull = 113;
-const ItemState kFlashlightOff = 114;
-const ItemState kFlashlightOn = 115;
-const ItemState kNitrogenEmpty = 116;
-const ItemState kNitrogenFull = 117;
-const ItemState kFullGlass = 118;
+static const ItemState kAI000 = 0;
+static const ItemState kAI005 = 1;
+static const ItemState kAI006 = 2;
+static const ItemState kAI010 = 3;
+static const ItemState kAI015 = 4;
+static const ItemState kAI016 = 5;
+static const ItemState kAI020 = 6;
+static const ItemState kAI024 = 7;
+static const ItemState kAI100 = 8;
+static const ItemState kAI101 = 9;
+static const ItemState kAI105 = 10;
+static const ItemState kAI106 = 11;
+static const ItemState kAI110 = 12;
+static const ItemState kAI111 = 13;
+static const ItemState kAI115 = 14;
+static const ItemState kAI116 = 15;
+static const ItemState kAI120 = 16;
+static const ItemState kAI121 = 17;
+static const ItemState kAI124 = 18;
+static const ItemState kAI125 = 19;
+static const ItemState kAI126 = 20;
+static const ItemState kAI200 = 21;
+static const ItemState kAI201 = 22;
+static const ItemState kAI202 = 23;
+static const ItemState kAI205 = 24;
+static const ItemState kAI206 = 25;
+static const ItemState kAI210 = 26;
+static const ItemState kAI211 = 27;
+static const ItemState kAI212 = 28;
+static const ItemState kAI215 = 29;
+static const ItemState kAI216 = 30;
+static const ItemState kAI220 = 31;
+static const ItemState kAI221 = 32;
+static const ItemState kAI222 = 33;
+static const ItemState kAI224 = 34;
+static const ItemState kAI225 = 35;
+static const ItemState kAI226 = 36;
+static const ItemState kAI300 = 37;
+static const ItemState kAI301 = 38;
+static const ItemState kAI302 = 39;
+static const ItemState kAI303 = 40;
+static const ItemState kAI305 = 41;
+static const ItemState kAI306 = 42;
+static const ItemState kAI310 = 43;
+static const ItemState kAI311 = 44;
+static const ItemState kAI312 = 45;
+static const ItemState kAI313 = 46;
+static const ItemState kAI315 = 47;
+static const ItemState kAI316 = 48;
+static const ItemState kAI320 = 49;
+static const ItemState kAI321 = 50;
+static const ItemState kAI322 = 51;
+static const ItemState kAI323 = 52;
+static const ItemState kAI324 = 53;
+static const ItemState kAI325 = 54;
+static const ItemState kAI326 = 55;
+static const ItemState kNormalItem = 56;
+static const ItemState kMapUnavailable = 57;
+static const ItemState kMapEngaged = 58;
+static const ItemState kOptical000 = 59;
+static const ItemState kOptical001 = 60;
+static const ItemState kOptical002 = 61;
+static const ItemState kOptical010 = 62;
+static const ItemState kOptical011 = 63;
+static const ItemState kOptical012 = 64;
+static const ItemState kOptical020 = 65;
+static const ItemState kOptical021 = 66;
+static const ItemState kOptical100 = 67;
+static const ItemState kOptical101 = 68;
+static const ItemState kOptical102 = 69;
+static const ItemState kOptical110 = 70;
+static const ItemState kOptical111 = 71;
+static const ItemState kOptical112 = 72;
+static const ItemState kOptical120 = 73;
+static const ItemState kOptical121 = 74;
+static const ItemState kOptical200 = 75;
+static const ItemState kOptical201 = 76;
+static const ItemState kOptical210 = 77;
+static const ItemState kOptical211 = 78;
+static const ItemState kPegasusTSA00 = 79;
+static const ItemState kPegasusTSA10 = 80;
+static const ItemState kPegasusPrehistoric00 = 81;
+static const ItemState kPegasusPrehistoric01 = 82;
+static const ItemState kPegasusPrehistoric10 = 83;
+static const ItemState kPegasusPrehistoric11 = 84;
+static const ItemState kPegasusMars00 = 85;
+static const ItemState kPegasusMars01 = 86;
+static const ItemState kPegasusMars10 = 87;
+static const ItemState kPegasusMars11 = 88;
+static const ItemState kPegasusNorad00 = 89;
+static const ItemState kPegasusNorad01 = 90;
+static const ItemState kPegasusNorad10 = 91;
+static const ItemState kPegasusNorad11 = 92;
+static const ItemState kPegasusWSC00 = 93;
+static const ItemState kPegasusWSC01 = 94;
+static const ItemState kPegasusWSC10 = 95;
+static const ItemState kPegasusWSC11 = 96;
+static const ItemState kPegasusCaldoria = 97;
+static const ItemState kRetinalSimulating = 98;
+static const ItemState kShieldNormal = 99;
+static const ItemState kShieldRadiation = 100;
+static const ItemState kShieldPlasma = 101;
+static const ItemState kShieldCardBomb = 102;
+static const ItemState kShieldDraining = 103;
+static const ItemState kAirMaskEmptyOff = 104;
+static const ItemState kAirMaskEmptyFilter = 105;
+static const ItemState kAirMaskLowOff = 106;
+static const ItemState kAirMaskLowFilter = 107;
+static const ItemState kAirMaskLowOn = 108;
+static const ItemState kAirMaskFullOff = 109;
+static const ItemState kAirMaskFullFilter = 110;
+static const ItemState kAirMaskFullOn = 111;
+static const ItemState kArgonEmpty = 112;
+static const ItemState kArgonFull = 113;
+static const ItemState kFlashlightOff = 114;
+static const ItemState kFlashlightOn = 115;
+static const ItemState kNitrogenEmpty = 116;
+static const ItemState kNitrogenFull = 117;
+static const ItemState kFullGlass = 118;
 
 //	Extra IDs.
 
-const uint32 kRetinalScanSearching = 0;
-const uint32 kRetinalScanActivated = 1;
-const uint32 kShieldIntro = 2;
-const uint32 kRemoveAirMask = 3;
-const uint32 kRemoveArgon = 4;
-const uint32 kRemoveCrowbar = 5;
-const uint32 kGasCanLoop = 6;
-const uint32 kRemoveJourneymanKey = 7;
-const uint32 kRemoveMarsCard = 8;
-const uint32 kRemoveNitrogen = 9;
-const uint32 kRemoveGlass = 10;
-const uint32 kRemoveDart = 11;
-const uint32 kRemoveSinclairKey = 12;
+static const uint32 kRetinalScanSearching = 0;
+static const uint32 kRetinalScanActivated = 1;
+static const uint32 kShieldIntro = 2;
+static const uint32 kRemoveAirMask = 3;
+static const uint32 kRemoveArgon = 4;
+static const uint32 kRemoveCrowbar = 5;
+static const uint32 kGasCanLoop = 6;
+static const uint32 kRemoveJourneymanKey = 7;
+static const uint32 kRemoveMarsCard = 8;
+static const uint32 kRemoveNitrogen = 9;
+static const uint32 kRemoveGlass = 10;
+static const uint32 kRemoveDart = 11;
+static const uint32 kRemoveSinclairKey = 12;
 
 enum ItemType {
 	kInventoryItemType,