diff options
| author | Max Horn | 2009-09-02 11:38:16 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-02 11:38:16 +0000 |
| commit | b391f08b46c3f47e8631248fd70ee21ebe12b744 (patch) | |
| tree | a95aae554585c754be495cc19cb87d4f7122ada6 /engines/sci/gfx | |
| parent | 0c7093e05c354d942ee1ed475e5c5cf9c688d384 (diff) | |
| download | scummvm-rg350-b391f08b46c3f47e8631248fd70ee21ebe12b744.tar.gz scummvm-rg350-b391f08b46c3f47e8631248fd70ee21ebe12b744.tar.bz2 scummvm-rg350-b391f08b46c3f47e8631248fd70ee21ebe12b744.zip | |
SCI: Renamed kernel_dereference_* to kernelDeref*, and added kernelDerefString
svn-id: r43907
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/menubar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp index 5f9936cb10..058fe648d4 100644 --- a/engines/sci/gfx/menubar.cpp +++ b/engines/sci/gfx/menubar.cpp @@ -294,7 +294,7 @@ int Menubar::setAttribute(EngineState *s, int menu_nr, int item_nr, int attribut case MENU_ATTRIBUTE_SAID: if (value.segment) { item->_saidPos = value; - memcpy(item->_said, kernel_dereference_bulk_pointer(s->segmentManager, value, 0), MENU_SAID_SPEC_SIZE); // Copy Said spec + memcpy(item->_said, kernelDerefBulkPtr(s->segmentManager, value, 0), MENU_SAID_SPEC_SIZE); // Copy Said spec item->_flags |= MENU_ATTRIBUTE_FLAGS_SAID; } else @@ -304,7 +304,7 @@ int Menubar::setAttribute(EngineState *s, int menu_nr, int item_nr, int attribut case MENU_ATTRIBUTE_TEXT: assert(value.segment); - item->_text = kernel_dereference_char_pointer(s->segmentManager, value, 0); + item->_text = kernelDerefString(s->segmentManager, value); item->_textPos = value; break; |