diff options
author | Bertrand Augereau | 2011-12-04 16:47:43 +0100 |
---|---|---|
committer | Bertrand Augereau | 2011-12-04 16:58:32 +0100 |
commit | 73a0e833569bd4474c032fdf43b5c59dd55ee2fc (patch) | |
tree | e7e3dcb8fc87a654b0cb321c64215ddd4cceb4ac /engines | |
parent | 7ce0cee00289d6c3360cdb9350678b29679249f0 (diff) | |
download | scummvm-rg350-73a0e833569bd4474c032fdf43b5c59dd55ee2fc.tar.gz scummvm-rg350-73a0e833569bd4474c032fdf43b5c59dd55ee2fc.tar.bz2 scummvm-rg350-73a0e833569bd4474c032fdf43b5c59dd55ee2fc.zip |
DREAMWEB: 'panelIcons1' ported to C++
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 31 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 12 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 1 |
4 files changed, 13 insertions, 32 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index 685b08e304..c72bd02a6c 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -10867,37 +10867,6 @@ void DreamGenContext::middlePanel() { showFrame(); } -void DreamGenContext::panelIcons1() { - STACK_CHECK; - di = 0; - _cmp(data.byte(kWatchon), 1); - if (flags.z()) - goto watchison; - di = 48; -watchison: - push(di); - ds = data.word(kIcons2); - _add(di, 204); - bx = 4; - al = 2; - ah = 0; - showFrame(); - di = pop(); - push(di); - _cmp(data.byte(kZoomon), 1); - if (flags.z()) - goto zoomisoff; - ds = data.word(kIcons1); - _add(di, 228); - bx = 8; - al = 5; - ah = 0; - showFrame(); -zoomisoff: - di = pop(); - showWatch(); -} - void DreamGenContext::blank() { STACK_CHECK; _cmp(data.byte(kCommandtype), 199); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index c053e56204..2328c3be4d 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -939,7 +939,6 @@ public: void loadSecondSample(); void transferConToEx(); void businessMan(); - void panelIcons1(); void adjustDown(); void withWhat(); void createFile(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 940d26a487..3205ee8569 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -2813,6 +2813,18 @@ void DreamGenContext::showMan() { showFrame(icons1(), 28, 25, 2, 0); } +void DreamGenContext::panelIcons1() { + uint16 x; + if (data.byte(kWatchon) != 1) + x = 48; + else + x = 0; + showFrame(icons2(), 204 + x, 4, 2, 0); + if (data.byte(kZoomon) != 1) + showFrame(icons1(), 228 + x, 8, 5, 0); + showWatch(); +} + uint8 DreamGenContext::getLocation(uint8 index) { return data.byte(kRoomscango + index); } diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 54e413ff8d..6a728d9edc 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -408,6 +408,7 @@ void showOuterPad(); void showExit(); void showMan(); + void panelIcons1(); void buttonOne(); void buttonTwo(); void buttonThree(); |