diff options
| author | Strangerke | 2016-08-22 07:52:57 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | f9323fe9fae6a45c0a4359775ba0383924a75c47 (patch) | |
| tree | 6087d6abe2f9ee22dcc6e6084b8aa7f60269e986 /engines/dm/inventory.h | |
| parent | 236a27e4cc902ab50fa850535f36993056ba0fbc (diff) | |
| download | scummvm-rg350-f9323fe9fae6a45c0a4359775ba0383924a75c47.tar.gz scummvm-rg350-f9323fe9fae6a45c0a4359775ba0383924a75c47.tar.bz2 scummvm-rg350-f9323fe9fae6a45c0a4359775ba0383924a75c47.zip | |
DM: Get rid of some globals in inventory
Diffstat (limited to 'engines/dm/inventory.h')
| -rw-r--r-- | engines/dm/inventory.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h index d16f22d6fa..856f7d02f8 100644 --- a/engines/dm/inventory.h +++ b/engines/dm/inventory.h @@ -37,9 +37,6 @@ namespace DM { #define k69_ChampionStatusBoxSpacing 69 // @ C69_CHAMPION_STATUS_BOX_SPACING #define k38_SlotBoxChestFirstSlot 38 // @ C38_SLOT_BOX_CHEST_FIRST_SLOT - -extern Box g32_BoxPanel; // @ G0032_s_Graphic562_Box_Panel - enum PanelContent { k0_PanelContentFoodWaterPoisoned = 0, // @ C00_PANEL_FOOD_WATER_POISONED k2_PanelContentScroll = 2, // @ C02_PANEL_SCROLL @@ -47,8 +44,6 @@ enum PanelContent { k5_PanelContentResurrectReincarnate = 5 // @ C05_PANEL_RESURRECT_REINCARNATE }; -extern const char* G0428_apc_SkillLevelNames[15]; // @ G0428_apc_SkillLevelNames - class InventoryMan { DMEngine *_vm; @@ -63,6 +58,8 @@ public: Thing _g426_openChest; // @ G0426_T_OpenChest int16 _g421_objDescTextXpos; // @ G0421_i_ObjectDescriptionTextX int16 _g422_objDescTextYpos; // @ G0422_i_ObjectDescriptionTextY + Box g32_BoxPanel; + const char* G0428_apc_SkillLevelNames[15]; void f355_toggleInventory(ChampionIndex championIndex); // @ F0355_INVENTORY_Toggle_CPSE void f354_drawStatusBoxPortrait(ChampionIndex championIndex); // @ F0354_INVENTORY_DrawStatusBoxPortrait |