DREAMWEB: Less direct references to kIcons1 and kIcons2

This commit is contained in:
Bertrand Augereau 2011-12-04 17:11:42 +01:00
parent a192f58539
commit 1f89c4e341
2 changed files with 8 additions and 10 deletions

View File

@ -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) {

View File

@ -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 */