aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2012-10-10 14:42:21 +0100
committerD G Turner2012-10-10 14:42:21 +0100
commit115593a6c10dfaf7e8213eccdf957e1ffb5e49af (patch)
treeffb243fb08a85033328902df3cd539619c62624d /engines
parentc92ff8db3385e1586c9758fce2343e213a49b5df (diff)
downloadscummvm-rg350-115593a6c10dfaf7e8213eccdf957e1ffb5e49af.tar.gz
scummvm-rg350-115593a6c10dfaf7e8213eccdf957e1ffb5e49af.tar.bz2
scummvm-rg350-115593a6c10dfaf7e8213eccdf957e1ffb5e49af.zip
TEENAGENT: Convert Inventory item ids to an enum.
Diffstat (limited to 'engines')
-rw-r--r--engines/teenagent/inventory.h188
1 files changed, 95 insertions, 93 deletions
diff --git a/engines/teenagent/inventory.h b/engines/teenagent/inventory.h
index 5dbc3d3027..d487848c2c 100644
--- a/engines/teenagent/inventory.h
+++ b/engines/teenagent/inventory.h
@@ -37,99 +37,101 @@ class TeenAgentEngine;
const uint8 kNumInventoryItems = 92;
// Inventory Item Ids
-const uint8 kInvItemNoItem = 0; // No item i.e. empty inventory slot
-const uint8 kInvItemFeather = 1;
-const uint8 kInvItemShotgun = 2;
-const uint8 kInvItemToolboxFull = 3; // Contains Car Jack and Spanner
-const uint8 kInvItemToolboxHalfEmpty = 4; // Contains Spanner
-const uint8 kInvItemSpanner = 5;
-const uint8 kInvItemComb = 6;
-const uint8 kInvItemFan = 7;
-const uint8 kInvItemBrokenPaddle = 8;
-const uint8 kInvItemPaddle = 9; // Repaired - BrokenPaddle combined with Branch (with Glue)
-const uint8 kInvItemFirstFlower = 10; // Smells nice
-const uint8 kInvItemSecondFlower = 11; // Really beautiful
-const uint8 kInvItemFeatherDusterClean = 12;
-const uint8 kInvItemChainsaw = 13; // Unfueled
-const uint8 kInvItemDrunkenChainsaw = 14; // Fueled with Whisky (Chainsaw combined with Whiskey)
-const uint8 kInvItemBranch = 15;
-const uint8 kInvItemWhisky = 16;
-const uint8 kInvItemNeedle = 17;
-const uint8 kInvItemWrapper = 18;
-const uint8 kInvItemChocCandy = 19;
-const uint8 kInvItemPotato = 20;
-const uint8 kInvItemRakeBroken = 21;
-const uint8 kInvItemHeartShapedCandy = 22;
-const uint8 kInvItemWrappedCandy = 23; // HeartShapedCandy combined with Wrapper
-const uint8 kInvItemRibbon = 24;
-const uint8 kInvItemRakeFixed = 25; // Rake combined with Ribbon
-const uint8 kInvItemNut = 26;
-const uint8 kInvItemPlasticApple = 27;
-const uint8 kInvItemCone = 28;
-const uint8 kInvItemSuperGlue = 29;
-const uint8 kInvItemConeAndNeedle = 30; // Cone combined with Needle
-const uint8 kInvItemConeAndFeather = 31; // Cone combined with Feather
-const uint8 kInvItemDart = 32; // Needle combined with ConeAndFeather or Feather combined with ConeAndNeedle
-const uint8 kInvItemFeatherDusterDirty = 33;
-const uint8 kInvItemPaintedPotato = 34; // Potato combined with Dirty Feather Duster (Soot)
-const uint8 kInvItemCarJack = 35;
-const uint8 kInvItemBone = 36;
-const uint8 kInvItemShovelAct2 = 37;
-const uint8 kInvItemRopeAct2 = 38;
-const uint8 kInvItemMask = 39;
-const uint8 kInvItemFins = 40;
-const uint8 kInvItemDiveEquipment = 41; // Mask combined with Fins
-const uint8 kInvItemAnchor = 42;
-const uint8 kInvItemGrapplingHook = 43;
-const uint8 kInvItemSickleBlunt = 44;
-const uint8 kInvItemCheese = 45;
-const uint8 kInvItemSickleSharp = 46;
-const uint8 kInvItemHandkerchief = 47;
-const uint8 kInvItemMouse = 48;
-const uint8 kInvItemRock = 49;
-const uint8 kInvItemNugget = 50;
-const uint8 kInvItemBanknote = 51;
-const uint8 kInvItemDictaphoneNoBatteries = 52;
-const uint8 kInvItemPolaroidCamera = 53;
-const uint8 kInvItemVideoTape = 54;
-const uint8 kInvItemSheetOfPaper = 55;
-const uint8 kInvItemCognac = 56;
-const uint8 kInvItemRemoteControl = 57;
-const uint8 kInvItemIceTongs = 58;
-const uint8 kInvItemCork = 59;
-const uint8 kInvItemWrappedCork = 60; // Cork combined with Sheet Of Paper
-const uint8 kInvItemPhoto = 61;
-const uint8 kInvItemChilliWithLabel = 62;
-const uint8 kInvItemPastryRoller = 63;
-const uint8 kInvItemFakeChilli = 64;
-const uint8 kInvItemLabel = 65;
-const uint8 kInvItemBatteries = 66;
-const uint8 kInvItemDictaphoneWithBatteries = 67; // Dictaphone combined with Batteries
-const uint8 kInvItemBurningPaper = 68;
-const uint8 kInvItemMeat = 69;
-const uint8 kInvItemPlasticBag = 70;
-const uint8 kInvItemSocks = 71;
-const uint8 kInvItemTimePills = 72;
-const uint8 kInvItemHandle = 73;
-const uint8 kInvItemChilliNoLabel = 74;
-const uint8 kInvItemPass = 75;
-const uint8 kInvItemBulb = 76;
-const uint8 kInvItemJailKey = 77;
-const uint8 kInvItemDelicatePlant = 78;
-const uint8 kInvItemSwissArmyKnife = 79;
-const uint8 kInvItemSpring = 80;
-const uint8 kInvItemShovelAct1 = 81;
-const uint8 kInvItemKaleidoscope = 82;
-const uint8 kInvItemSoldierNews = 83;
-const uint8 kInvItemGrenade = 84;
-const uint8 kInvItemMug = 85; // Empty
-const uint8 kInvItemMugOfMud = 86; // Full of mud
-const uint8 kInvItemCrumbs = 87;
-const uint8 kInvItemRopeAct1 = 88;
-const uint8 kInvItemRopeAndGrenade = 89; // Rope combined with Grenade
-const uint8 kInvItemMedicine = 90;
-const uint8 kInvItemDruggedFood = 91; // Crumbs combined with Medicine
-const uint8 kInvItemBird = 92;
+enum {
+ kInvItemNoItem = 0, // No item i.e. empty inventory slot
+ kInvItemFeather = 1,
+ kInvItemShotgun = 2,
+ kInvItemToolboxFull = 3, // Contains Car Jack and Spanner
+ kInvItemToolboxHalfEmpty = 4, // Contains Spanner
+ kInvItemSpanner = 5,
+ kInvItemComb = 6,
+ kInvItemFan = 7,
+ kInvItemBrokenPaddle = 8,
+ kInvItemPaddle = 9, // Repaired - BrokenPaddle combined with Branch (with Glue)
+ kInvItemFirstFlower = 10, // Smells nice
+ kInvItemSecondFlower = 11, // Really beautiful
+ kInvItemFeatherDusterClean = 12,
+ kInvItemChainsaw = 13, // Unfueled
+ kInvItemDrunkenChainsaw = 14, // Fueled with Whisky (Chainsaw combined with Whiskey)
+ kInvItemBranch = 15,
+ kInvItemWhisky = 16,
+ kInvItemNeedle = 17,
+ kInvItemWrapper = 18,
+ kInvItemChocCandy = 19,
+ kInvItemPotato = 20,
+ kInvItemRakeBroken = 21,
+ kInvItemHeartShapedCandy = 22,
+ kInvItemWrappedCandy = 23, // HeartShapedCandy combined with Wrapper
+ kInvItemRibbon = 24,
+ kInvItemRakeFixed = 25, // Rake combined with Ribbon
+ kInvItemNut = 26,
+ kInvItemPlasticApple = 27,
+ kInvItemCone = 28,
+ kInvItemSuperGlue = 29,
+ kInvItemConeAndNeedle = 30, // Cone combined with Needle
+ kInvItemConeAndFeather = 31, // Cone combined with Feather
+ kInvItemDart = 32, // Needle combined with ConeAndFeather or Feather combined with ConeAndNeedle
+ kInvItemFeatherDusterDirty = 33,
+ kInvItemPaintedPotato = 34, // Potato combined with Dirty Feather Duster (Soot)
+ kInvItemCarJack = 35,
+ kInvItemBone = 36,
+ kInvItemShovelAct2 = 37,
+ kInvItemRopeAct2 = 38,
+ kInvItemMask = 39,
+ kInvItemFins = 40,
+ kInvItemDiveEquipment = 41, // Mask combined with Fins
+ kInvItemAnchor = 42,
+ kInvItemGrapplingHook = 43,
+ kInvItemSickleBlunt = 44,
+ kInvItemCheese = 45,
+ kInvItemSickleSharp = 46,
+ kInvItemHandkerchief = 47,
+ kInvItemMouse = 48,
+ kInvItemRock = 49,
+ kInvItemNugget = 50,
+ kInvItemBanknote = 51,
+ kInvItemDictaphoneNoBatteries = 52,
+ kInvItemPolaroidCamera = 53,
+ kInvItemVideoTape = 54,
+ kInvItemSheetOfPaper = 55,
+ kInvItemCognac = 56,
+ kInvItemRemoteControl = 57,
+ kInvItemIceTongs = 58,
+ kInvItemCork = 59,
+ kInvItemWrappedCork = 60, // Cork combined with Sheet Of Paper
+ kInvItemPhoto = 61,
+ kInvItemChilliWithLabel = 62,
+ kInvItemPastryRoller = 63,
+ kInvItemFakeChilli = 64,
+ kInvItemLabel = 65,
+ kInvItemBatteries = 66,
+ kInvItemDictaphoneWithBatteries = 67, // Dictaphone combined with Batteries
+ kInvItemBurningPaper = 68,
+ kInvItemMeat = 69,
+ kInvItemPlasticBag = 70,
+ kInvItemSocks = 71,
+ kInvItemTimePills = 72,
+ kInvItemHandle = 73,
+ kInvItemChilliNoLabel = 74,
+ kInvItemPass = 75,
+ kInvItemBulb = 76,
+ kInvItemJailKey = 77,
+ kInvItemDelicatePlant = 78,
+ kInvItemSwissArmyKnife = 79,
+ kInvItemSpring = 80,
+ kInvItemShovelAct1 = 81,
+ kInvItemKaleidoscope = 82,
+ kInvItemSoldierNews = 83,
+ kInvItemGrenade = 84,
+ kInvItemMug = 85, // Empty
+ kInvItemMugOfMud = 86, // Full of mud
+ kInvItemCrumbs = 87,
+ kInvItemRopeAct1 = 88,
+ kInvItemRopeAndGrenade = 89, // Rope combined with Grenade
+ kInvItemMedicine = 90,
+ kInvItemDruggedFood = 91, // Crumbs combined with Medicine
+ kInvItemBird = 92
+};
// Maximum number of inventory items held by Ego (Mark)
const uint8 kInventorySize = 24;