diff options
author | Martin Kiewitz | 2009-11-03 19:33:31 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-11-03 19:33:31 +0000 |
commit | d758538eaa6a4c6651d4b5b1aabe18228997a25f (patch) | |
tree | 31b8696e906765c6aa2791afbd98d1bd5cde4887 /engines/sci/gui32 | |
parent | 34aaac37fc565624abb0e52bcc07d7bfed5f5c67 (diff) | |
download | scummvm-rg350-d758538eaa6a4c6651d4b5b1aabe18228997a25f.tar.gz scummvm-rg350-d758538eaa6a4c6651d4b5b1aabe18228997a25f.tar.bz2 scummvm-rg350-d758538eaa6a4c6651d4b5b1aabe18228997a25f.zip |
SCI/newgui: SciGuiMenu partially implemented
svn-id: r45634
Diffstat (limited to 'engines/sci/gui32')
-rw-r--r-- | engines/sci/gui32/gui32.cpp | 10 | ||||
-rw-r--r-- | engines/sci/gui32/gui32.h | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp index 3a51f92aa9..5b6900f6eb 100644 --- a/engines/sci/gui32/gui32.cpp +++ b/engines/sci/gui32/gui32.cpp @@ -834,14 +834,8 @@ void SciGui32::menuAdd(Common::String title, Common::String content, reg_t entri _s->_menubar->addMenu(_s->gfx_state, title, content, titlebarFont, entriesBase); } -void SciGui32::menuSet(int argc, reg_t *argv) { - int index = argv[0].toUint16(); - int i = 2; - - while (i < argc) { - _s->_menubar->setAttribute(_s, (index >> 8) - 1, (index & 0xff) - 1, argv[i - 1].toUint16(), argv[i]); - i += 2; - } +void SciGui32::menuSet(uint16 menuId, uint16 itemId, uint16 attributeId, reg_t value) { + _s->_menubar->setAttribute(_s, menuId - 1, itemId - 1, attributeId, value); } reg_t SciGui32::menuGet(uint16 menuId, uint16 itemId, uint16 attributeId) { diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h index 6256ee15ff..a0dae12f0e 100644 --- a/engines/sci/gui32/gui32.h +++ b/engines/sci/gui32/gui32.h @@ -61,7 +61,7 @@ public: void drawStatus(const char *text, int16 colorPen, int16 colorBack); void drawMenuBar(bool clear); void menuAdd(Common::String title, Common::String content, reg_t entriesBase); - void menuSet(int argc, reg_t *argv); + void menuSet(uint16 menuId, uint16 itemId, uint16 attributeId, reg_t value); reg_t menuGet(uint16 menuId, uint16 itemId, uint16 attributeId); reg_t menuSelect(reg_t eventObject); |