aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Augereau2011-12-01 00:01:54 +0100
committerBertrand Augereau2011-12-01 00:01:54 +0100
commit4d92522fcc51aff067c6ab0a525b3c825f51e2ae (patch)
tree73dbb53d8b89e6af4efd368d40cd0cd3d8c029c4
parent22a3c1937469c4d409e09ea9ea4f20e5c540f922 (diff)
downloadscummvm-rg350-4d92522fcc51aff067c6ab0a525b3c825f51e2ae.tar.gz
scummvm-rg350-4d92522fcc51aff067c6ab0a525b3c825f51e2ae.tar.bz2
scummvm-rg350-4d92522fcc51aff067c6ab0a525b3c825f51e2ae.zip
DREAMWEB: 'worktoscreenm' ported to C++
-rwxr-xr-xdevtools/tasmrecover/tasm-recover1
-rw-r--r--engines/dreamweb/dreamgen.cpp10
-rw-r--r--engines/dreamweb/dreamgen.h2
-rw-r--r--engines/dreamweb/stubs.cpp9
-rw-r--r--engines/dreamweb/stubs.h1
5 files changed, 11 insertions, 12 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a2e6435bd0..27fb419051 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -333,6 +333,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'removeemm',
'setupemm',
'trysoundalloc',
+ 'worktoscreenm',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d5d2ca8e4e..c58bf5f909 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -12009,16 +12009,6 @@ zoomisoff:
showwatch();
}
-void DreamGenContext::worktoscreenm() {
- STACK_CHECK;
- animpointer();
- readmouse();
- showpointer();
- vsync();
- worktoscreen();
- delpointer();
-}
-
void DreamGenContext::blank() {
STACK_CHECK;
_cmp(data.byte(kCommandtype), 199);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 834abf04f0..a3b51036d9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -67,7 +67,6 @@ public:
static const uint16 addr_getunderzoom = 0xcab4;
static const uint16 addr_allpointer = 0xcaa4;
static const uint16 addr_blank = 0xcaa0;
- static const uint16 addr_worktoscreenm = 0xca9c;
static const uint16 addr_gettime = 0xca8c;
static const uint16 addr_panelicons1 = 0xca84;
static const uint16 addr_showexit = 0xca80;
@@ -1114,7 +1113,6 @@ public:
void useopenbox();
void clearbuffers();
void showsymbol();
- void worktoscreenm();
void getobtextstart();
void dumpdiarykeys();
void getridofreels();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 09f6f7109e..2d8faa7a58 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2483,5 +2483,14 @@ void DreamGenContext::allocatebuffers() {
data.word(kSounddata2) = allocatemem(2048/16);
}
+void DreamGenContext::worktoscreenm() {
+ animpointer();
+ readmouse();
+ showpointer();
+ vsync();
+ worktoscreen();
+ delpointer();
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 67cfe41212..1ec3e1411d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -374,4 +374,5 @@
void loadtraveltext();
void drawfloor();
void allocatebuffers();
+ void worktoscreenm();