[Scummvm-cvs-logs] scummvm master -> 4d92522fcc51aff067c6ab0a525b3c825f51e2ae
tramboi
bertrand_augereau at yahoo.fr
Wed Nov 30 23:03:32 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4d92522fcc DREAMWEB: 'worktoscreenm' ported to C++
Commit: 4d92522fcc51aff067c6ab0a525b3c825f51e2ae
https://github.com/scummvm/scummvm/commit/4d92522fcc51aff067c6ab0a525b3c825f51e2ae
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-30T15:01:54-08:00
Commit Message:
DREAMWEB: 'worktoscreenm' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a2e6435..27fb419 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 d5d2ca8..c58bf5f 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 834abf0..a3b5103 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 09f6f71..2d8faa7 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 67cfe41..1ec3e14 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -374,4 +374,5 @@
void loadtraveltext();
void drawfloor();
void allocatebuffers();
+ void worktoscreenm();
More information about the Scummvm-git-logs
mailing list