[Scummvm-cvs-logs] scummvm master -> 956018f067aed07e1e6d1091e6120cf7ca8e0c58
tramboi
bertrand_augereau at yahoo.fr
Wed Nov 16 19:49:36 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:
956018f067 DREAMWEB: 'getundermenu' and 'putundermenu' ported to C++
Commit: 956018f067aed07e1e6d1091e6120cf7ca8e0c58
https://github.com/scummvm/scummvm/commit/956018f067aed07e1e6d1091e6120cf7ca8e0c58
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-16T12:41:36-08:00
Commit Message:
DREAMWEB: 'getundermenu' and 'putundermenu' 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 cf4605c..2d8461d 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -222,6 +222,8 @@ generator = cpp(context, "DreamGen", blacklist = [
'watchcount',
'zoomicon',
'loadroom',
+ 'getundermenu',
+ 'putundermenu',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 78c4482..d33ad8f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10757,28 +10757,6 @@ void DreamGenContext::dumpmenu() {
multidump();
}
-void DreamGenContext::getundermenu() {
- STACK_CHECK;
- di = (80+40);
- bx = (60);
- cl = 48;
- ch = 48;
- ds = data.word(kBuffers);
- si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
- multiget();
-}
-
-void DreamGenContext::putundermenu() {
- STACK_CHECK;
- di = (80+40);
- bx = (60);
- cl = 48;
- ch = 48;
- ds = data.word(kBuffers);
- si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
- multiput();
-}
-
void DreamGenContext::showoutermenu() {
STACK_CHECK;
al = 40;
@@ -16330,8 +16308,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
case addr_dumpkeypad: dumpkeypad(); break;
case addr_usemenu: usemenu(); break;
case addr_dumpmenu: dumpmenu(); break;
- case addr_getundermenu: getundermenu(); break;
- case addr_putundermenu: putundermenu(); break;
case addr_showoutermenu: showoutermenu(); break;
case addr_showmenu: showmenu(); break;
case addr_loadmenu: loadmenu(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f0c41be..e79257d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -231,8 +231,6 @@ public:
static const uint16 addr_loadmenu = 0xc7b0;
static const uint16 addr_showmenu = 0xc7ac;
static const uint16 addr_showoutermenu = 0xc7a8;
- static const uint16 addr_putundermenu = 0xc7a4;
- static const uint16 addr_getundermenu = 0xc7a0;
static const uint16 addr_dumpmenu = 0xc79c;
static const uint16 addr_usemenu = 0xc798;
static const uint16 addr_dumpkeypad = 0xc794;
@@ -1551,7 +1549,7 @@ public:
void clearchanges();
void errormessage3();
//void deletetaken();
- void putundermenu();
+ //void putundermenu();
void intromonks2();
void intromagic2();
void intromagic3();
@@ -1700,7 +1698,7 @@ public:
void trapdoor();
void openlouis();
void buttonthree();
- void getundermenu();
+ //void getundermenu();
//void randomnumber();
void lookatcard();
void helicopter();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2f9b253..0be8cd3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2014,5 +2014,13 @@ void DreamGenContext::loadroom() {
getdimension();
}
+void DreamGenContext::getundermenu() {
+ multiget(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+}
+
+void DreamGenContext::putundermenu() {
+ multiput(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bf67df9..90d3178 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -268,5 +268,6 @@
void watchcount();
void zoomicon();
void loadroom();
-
+ void getundermenu();
+ void putundermenu();
More information about the Scummvm-git-logs
mailing list