diff options
author | Bertrand Augereau | 2011-12-04 17:04:51 +0100 |
---|---|---|
committer | Bertrand Augereau | 2011-12-04 17:08:00 +0100 |
commit | a192f5853921367d489b69c2a59fea1694269f16 (patch) | |
tree | 54d4743ab950bdef2ed8fd834fa86bd8644acea5 | |
parent | 18e84f9c1138ea4ce66cbbea53e6957bee3e588f (diff) | |
download | scummvm-rg350-a192f5853921367d489b69c2a59fea1694269f16.tar.gz scummvm-rg350-a192f5853921367d489b69c2a59fea1694269f16.tar.bz2 scummvm-rg350-a192f5853921367d489b69c2a59fea1694269f16.zip |
DREAMWEB: 'examIcon' ported to C++
-rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 10 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4b7e28c270..8d956093bb 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -211,6 +211,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'entersymbol', 'eraseoldobs', 'error', + 'examicon', 'examineob', 'examineobtext', 'facerightway', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index c72bd02a6c..43d5fd2c7e 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -2926,16 +2926,6 @@ void DreamGenContext::openOb() { cs.word(bx) = ax; } -void DreamGenContext::examIcon() { - STACK_CHECK; - ds = data.word(kIcons2); - di = 254; - bx = 5; - al = 3; - ah = 0; - showFrame(); -} - void DreamGenContext::describeOb() { STACK_CHECK; getObTextStart(); diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 2328c3be4d..9117c93bcc 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -831,7 +831,6 @@ public: void deleteExText(); void foghornSound(); void liftNoise(); - void examIcon(); void showGun(); void louisChair(); void locationPic(); diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 3205ee8569..754d4af49d 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -2825,6 +2825,10 @@ void DreamGenContext::panelIcons1() { showWatch(); } +void DreamGenContext::examIcon() { + showFrame(icons2(), 254, 5, 3, 0); +} + uint8 DreamGenContext::getLocation(uint8 index) { return data.byte(kRoomscango + index); } diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 6a728d9edc..99ef27b23e 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -409,6 +409,7 @@ void showExit(); void showMan(); void panelIcons1(); + void examIcon(); void buttonOne(); void buttonTwo(); void buttonThree(); |