diff options
author | Bertrand Augereau | 2011-12-04 17:11:42 +0100 |
---|---|---|
committer | Bertrand Augereau | 2011-12-04 17:11:42 +0100 |
commit | 1f89c4e34100d5628809efd56edb024306667331 (patch) | |
tree | 0dbbad06a45e9f79e79146b9d3c31214c4fab493 /engines | |
parent | a192f5853921367d489b69c2a59fea1694269f16 (diff) | |
download | scummvm-rg350-1f89c4e34100d5628809efd56edb024306667331.tar.gz scummvm-rg350-1f89c4e34100d5628809efd56edb024306667331.tar.bz2 scummvm-rg350-1f89c4e34100d5628809efd56edb024306667331.zip |
DREAMWEB: Less direct references to kIcons1 and kIcons2
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/object.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp index 4877937060..4caeddfd1e 100644 --- a/engines/dreamweb/object.cpp +++ b/engines/dreamweb/object.cpp @@ -104,10 +104,10 @@ void DreamGenContext::obIcons() { getAnyAd(&value1, &value2); if (value1 != 0xff) { // can open it - showFrame((Frame *)getSegment(data.word(kIcons2)).ptr(0, 0), 210, 1, 4, 0); + showFrame(icons2(), 210, 1, 4, 0); } - showFrame((Frame *)getSegment(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0); + showFrame(icons2(), 260, 1, 1, 0); } void DreamGenContext::examineOb(bool examineAgain) { diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp index 1c297f1e93..a14c4160f0 100644 --- a/engines/dreamweb/vgagrafx.cpp +++ b/engines/dreamweb/vgagrafx.cpp @@ -493,18 +493,16 @@ void DreamGenContext::loadPalFromIFF() { } void DreamGenContext::createPanel() { - Frame *icons = (Frame *)getSegment(data.word(kIcons2)).ptr(0, 0); - showFrame(icons, 0, 8, 0, 2); - showFrame(icons, 160, 8, 0, 2); - showFrame(icons, 0, 104, 0, 2); - showFrame(icons, 160, 104, 0, 2); + showFrame(icons2(), 0, 8, 0, 2); + showFrame(icons2(), 160, 8, 0, 2); + showFrame(icons2(), 0, 104, 0, 2); + showFrame(icons2(), 160, 104, 0, 2); } void DreamGenContext::createPanel2() { createPanel(); - Frame *icons = (Frame *)getSegment(data.word(kIcons2)).ptr(0, 0); - showFrame(icons, 0, 0, 5, 2); - showFrame(icons, 160, 0, 5, 2); + showFrame(icons2(), 0, 0, 5, 2); + showFrame(icons2(), 160, 0, 5, 2); } } /*namespace dreamgen */ |