diff options
| author | Robert Göffringmann | 2003-12-21 16:50:02 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2003-12-21 16:50:02 +0000 |
| commit | 5d8516f2ec76bdfe4f255601d8b47b345794cbb3 (patch) | |
| tree | e049a7fbd999d193c06e7dccd258ea0562ca4170 /sword1/menu.h | |
| parent | 7c09bd869b920bac34ec49938af7fee4ecaafdbc (diff) | |
| download | scummvm-rg350-5d8516f2ec76bdfe4f255601d8b47b345794cbb3.tar.gz scummvm-rg350-5d8516f2ec76bdfe4f255601d8b47b345794cbb3.tar.bz2 scummvm-rg350-5d8516f2ec76bdfe4f255601d8b47b345794cbb3.zip | |
now two inventory items can be combined
svn-id: r11823
Diffstat (limited to 'sword1/menu.h')
| -rw-r--r-- | sword1/menu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sword1/menu.h b/sword1/menu.h index 7bb5e8e355..cd6eb3dee0 100644 --- a/sword1/menu.h +++ b/sword1/menu.h @@ -72,6 +72,7 @@ public: void fnStartMenu(void); void fnEndMenu(void); void checkTopMenu(void); + static const MenuObject _objectDefs[TOTAL_pockets + 1]; private: void buildSubjects(void); @@ -87,12 +88,10 @@ private: SwordMenuIcon *_objects[TOTAL_pockets]; uint32 _menuList[TOTAL_pockets]; uint32 _inMenu; - uint32 _secondItem; SwordScreen *_screen; SwordMouse *_mouse; static const Subject _subjectList[TOTAL_subjects]; - static const MenuObject _objectDefs[TOTAL_pockets + 1]; }; #endif //BSMENU_H |